Skip to content

Commit 531adeb

Browse files
committed
build-llvm: Don't hardcode default choices of linker/stdlib on Windows
This should help with using clangd for other mingw toolchain installs.
1 parent 63691c6 commit 531adeb

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

build-llvm.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,6 @@ if [ -n "$COMPILER_LAUNCHER" ]; then
242242
CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_CXX_COMPILER_LAUNCHER=$COMPILER_LAUNCHER"
243243
fi
244244

245-
if [ -n "$TARGET_WINDOWS" ]; then
246-
# Custom, llvm-mingw specific defaults. We normally set these in
247-
# the frontend wrappers, but this makes sure they are enabled by
248-
# default if that wrapper is bypassed as well.
249-
CMAKEFLAGS="$CMAKEFLAGS -DCLANG_DEFAULT_RTLIB=compiler-rt"
250-
CMAKEFLAGS="$CMAKEFLAGS -DCLANG_DEFAULT_UNWINDLIB=libunwind"
251-
CMAKEFLAGS="$CMAKEFLAGS -DCLANG_DEFAULT_CXX_STDLIB=libc++"
252-
CMAKEFLAGS="$CMAKEFLAGS -DCLANG_DEFAULT_LINKER=lld"
253-
CMAKEFLAGS="$CMAKEFLAGS -DLLD_DEFAULT_LD_LLD_IS_MINGW=ON"
254-
fi
255-
256245
if [ -n "$LTO" ]; then
257246
CMAKEFLAGS="$CMAKEFLAGS -DLLVM_ENABLE_LTO=$LTO"
258247
fi

0 commit comments

Comments
 (0)