From 434877cfe1320dfc502e65d806b6375c8ea6ffda Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Wed, 11 Aug 2021 15:48:36 -0400 Subject: [PATCH 1/2] Remove cpp, allow gcc -E fallback Also switches to using mingw-w64 "familiar" suffixes --- windows-arm64/Dockerfile.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/windows-arm64/Dockerfile.in b/windows-arm64/Dockerfile.in index 43dbbb6..3be2fb6 100644 --- a/windows-arm64/Dockerfile.in +++ b/windows-arm64/Dockerfile.in @@ -12,9 +12,8 @@ RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ - CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ - CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ - CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ + CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \ + CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \ LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran From 713ebf04917c123578e3d74f7b81a5c9634ac654 Mon Sep 17 00:00:00 2001 From: tresf Date: Wed, 11 Aug 2021 15:55:51 -0400 Subject: [PATCH 2/2] Remove cpp from ARMv7 too --- windows-armv7/Dockerfile.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/windows-armv7/Dockerfile.in b/windows-armv7/Dockerfile.in index 0d62037..6f28818 100644 --- a/windows-armv7/Dockerfile.in +++ b/windows-armv7/Dockerfile.in @@ -12,9 +12,8 @@ RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \ AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \ - CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \ - CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \ - CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \ + CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \ + CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \ LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \ FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran