build-libcxx: Remove some unused cmake defines
These don't seem to be necessary in practice at the moment. If building on top of a stripped llvm install, while there's an older version of llvm (providing llvm-config) installed system wide, we currently still manage to build things correctly. (If llvm-config from LLVM 6.0 is available, build-compiler-rt.sh fails though, but that's unaffected by this change. In current git versions of compiler-rt, it first and foremost looks inside the monorepo checkout instead of looking for a potentially unrelated llvm-config binary.)
This commit is contained in:
1 parent
59121bc4a0
commit
14098d92bc
1 file changed
-10
@@ -87,10 +87,6 @@ build_all() {
|
|||||||
[ -z "$CLEAN" ] || rm -rf build-$arch-$type
|
[ -z "$CLEAN" ] || rm -rf build-$arch-$type
|
||||||
mkdir -p build-$arch-$type
|
mkdir -p build-$arch-$type
|
||||||
cd build-$arch-$type
|
cd build-$arch-$type
|
||||||
# CXX_SUPPORTS_CXX11 is not strictly necessary here. But if building
|
|
||||||
# with a stripped llvm install, and the system happens to have an older
|
|
||||||
# llvm-config in /usr/bin, it can end up including older cmake files,
|
|
||||||
# and then CXX_SUPPORTS_CXX11 needs to be set.
|
|
||||||
cmake \
|
cmake \
|
||||||
${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
|
${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
@@ -102,11 +98,8 @@ build_all() {
|
|||||||
-DCMAKE_C_COMPILER_WORKS=TRUE \
|
-DCMAKE_C_COMPILER_WORKS=TRUE \
|
||||||
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
|
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
|
||||||
-DLLVM_PATH="$LLVM_PATH" \
|
-DLLVM_PATH="$LLVM_PATH" \
|
||||||
-DLLVM_COMPILER_CHECKED=TRUE \
|
|
||||||
-DCMAKE_AR="$PREFIX/bin/llvm-ar" \
|
-DCMAKE_AR="$PREFIX/bin/llvm-ar" \
|
||||||
-DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
|
-DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
|
||||||
-DCXX_SUPPORTS_CXX11=TRUE \
|
|
||||||
-DCXX_SUPPORTS_CXX_STD=TRUE \
|
|
||||||
-DLIBUNWIND_USE_COMPILER_RT=TRUE \
|
-DLIBUNWIND_USE_COMPILER_RT=TRUE \
|
||||||
-DLIBUNWIND_ENABLE_THREADS=TRUE \
|
-DLIBUNWIND_ENABLE_THREADS=TRUE \
|
||||||
-DLIBUNWIND_ENABLE_SHARED=$SHARED \
|
-DLIBUNWIND_ENABLE_SHARED=$SHARED \
|
||||||
@@ -142,7 +135,6 @@ build_all() {
|
|||||||
-DCMAKE_SYSTEM_NAME=Windows \
|
-DCMAKE_SYSTEM_NAME=Windows \
|
||||||
-DCMAKE_C_COMPILER_WORKS=TRUE \
|
-DCMAKE_C_COMPILER_WORKS=TRUE \
|
||||||
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
|
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
|
||||||
-DLLVM_COMPILER_CHECKED=TRUE \
|
|
||||||
-DCMAKE_AR="$PREFIX/bin/llvm-ar" \
|
-DCMAKE_AR="$PREFIX/bin/llvm-ar" \
|
||||||
-DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
|
-DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
|
||||||
-DLLVM_PATH="$LLVM_PATH" \
|
-DLLVM_PATH="$LLVM_PATH" \
|
||||||
@@ -185,7 +177,6 @@ build_all() {
|
|||||||
-DCMAKE_C_COMPILER_WORKS=TRUE \
|
-DCMAKE_C_COMPILER_WORKS=TRUE \
|
||||||
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
|
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
|
||||||
-DLLVM_PATH="$LLVM_PATH" \
|
-DLLVM_PATH="$LLVM_PATH" \
|
||||||
-DLLVM_COMPILER_CHECKED=TRUE \
|
|
||||||
-DCMAKE_AR="$PREFIX/bin/llvm-ar" \
|
-DCMAKE_AR="$PREFIX/bin/llvm-ar" \
|
||||||
-DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
|
-DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
|
||||||
-DLIBCXXABI_USE_COMPILER_RT=ON \
|
-DLIBCXXABI_USE_COMPILER_RT=ON \
|
||||||
@@ -196,7 +187,6 @@ build_all() {
|
|||||||
-DLIBCXXABI_LIBCXX_INCLUDES=../../libcxx/build-$arch-$type/include/c++/v1 \
|
-DLIBCXXABI_LIBCXX_INCLUDES=../../libcxx/build-$arch-$type/include/c++/v1 \
|
||||||
-DLIBCXXABI_LIBDIR_SUFFIX="" \
|
-DLIBCXXABI_LIBDIR_SUFFIX="" \
|
||||||
-DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=ON \
|
-DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=ON \
|
||||||
-DCXX_SUPPORTS_CXX_STD=TRUE \
|
|
||||||
-DLIBCXX_ENABLE_SHARED=$SHARED \
|
-DLIBCXX_ENABLE_SHARED=$SHARED \
|
||||||
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
|
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
|
||||||
..
|
..
|
||||||
|
|||||||
Reference in new issue
Block a user