From 7060e41fc1f91753b9deb1a637d5c5435d01c95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 3 Aug 2022 14:50:32 +0300 Subject: [PATCH] Stop manually setting CMAKE_CROSSCOMPILING This is set implicitly when CMAKE_SYSTEM_NAME is set. According to the docs, the user isn't supposed to set it manually. --- build-libcxx.sh | 1 - build-lldb-mi.sh | 1 - build-llvm.sh | 1 - build-openmp.sh | 1 - 4 files changed, 4 deletions(-) diff --git a/build-libcxx.sh b/build-libcxx.sh index b1a65fe..8bbdd73 100755 --- a/build-libcxx.sh +++ b/build-libcxx.sh @@ -85,7 +85,6 @@ for arch in $ARCHS; do -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \ -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \ -DCMAKE_CXX_COMPILER_TARGET=$arch-w64-windows-gnu \ - -DCMAKE_CROSSCOMPILING=TRUE \ -DCMAKE_SYSTEM_NAME=Windows \ -DCMAKE_C_COMPILER_WORKS=TRUE \ -DCMAKE_CXX_COMPILER_WORKS=TRUE \ diff --git a/build-lldb-mi.sh b/build-lldb-mi.sh index a0e7702..d154902 100755 --- a/build-lldb-mi.sh +++ b/build-lldb-mi.sh @@ -92,7 +92,6 @@ if [ -n "$HOST" ]; then BUILDDIR=$BUILDDIR-$HOST CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_SYSTEM_NAME=Windows" - CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_CROSSCOMPILING=TRUE" CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_C_COMPILER=$HOST-gcc" CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_CXX_COMPILER=$HOST-g++" CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_RC_COMPILER=$HOST-windres" diff --git a/build-llvm.sh b/build-llvm.sh index 609c25d..ca77802 100755 --- a/build-llvm.sh +++ b/build-llvm.sh @@ -148,7 +148,6 @@ CMAKEFLAGS="$LLVM_CMAKEFLAGS" if [ -n "$HOST" ]; then CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_SYSTEM_NAME=Windows" - CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_CROSSCOMPILING=TRUE" CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_C_COMPILER=$HOST-gcc" CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_CXX_COMPILER=$HOST-g++" CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_RC_COMPILER=$HOST-windres" diff --git a/build-openmp.sh b/build-openmp.sh index a10bcb1..104e1e5 100755 --- a/build-openmp.sh +++ b/build-openmp.sh @@ -80,7 +80,6 @@ for arch in $ARCHS; do -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \ -DCMAKE_RC_COMPILER=$arch-w64-mingw32-windres \ -DCMAKE_ASM_MASM_COMPILER=llvm-ml \ - -DCMAKE_CROSSCOMPILING=TRUE \ -DCMAKE_SYSTEM_NAME=Windows \ -DCMAKE_AR="$PREFIX/bin/llvm-ar" \ -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \