From 25c3bd8593e4afa76cfb5627d92215a66d19f880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 15 Mar 2019 23:53:20 +0200 Subject: [PATCH] Set LLVM_COMPILER_CHECKED when bootstrapping libunwind/libcxxabi/libcxx The checks behind LLVM_COMPILER_CHECKED fail if there's no libc++ available for linking. This fixes building libunwind/libcxxabi/libcxx with newer versions of llvm, if the llvm installation isn't stripped. --- build-libcxx.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-libcxx.sh b/build-libcxx.sh index 9bcc558..79b0596 100755 --- a/build-libcxx.sh +++ b/build-libcxx.sh @@ -99,6 +99,7 @@ build_all() { -DCMAKE_SYSTEM_NAME=Windows \ -DCMAKE_C_COMPILER_WORKS=TRUE \ -DCMAKE_CXX_COMPILER_WORKS=TRUE \ + -DLLVM_COMPILER_CHECKED=TRUE \ -DCMAKE_AR=$PREFIX/bin/llvm-ar \ -DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \ -DLLVM_NO_OLD_LIBSTDCXX=TRUE \ @@ -148,6 +149,7 @@ build_all() { -DCMAKE_SYSTEM_NAME=Windows \ -DCMAKE_C_COMPILER_WORKS=TRUE \ -DCMAKE_CXX_COMPILER_WORKS=TRUE \ + -DLLVM_COMPILER_CHECKED=TRUE \ -DCMAKE_AR=$PREFIX/bin/llvm-ar \ -DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \ -DLIBCXXABI_USE_COMPILER_RT=ON \ @@ -186,6 +188,7 @@ build_all() { -DCMAKE_SYSTEM_NAME=Windows \ -DCMAKE_C_COMPILER_WORKS=TRUE \ -DCMAKE_CXX_COMPILER_WORKS=TRUE \ + -DLLVM_COMPILER_CHECKED=TRUE \ -DCMAKE_AR=$PREFIX/bin/llvm-ar \ -DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \ -DLIBCXX_USE_COMPILER_RT=ON \