File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed
compiler-rt/lib/sanitizer_common/symbolizer/scripts Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -79,13 +79,16 @@ AR="${AR}" CC="${CC}" CFLAGS="$FLAGS -Wno-deprecated-non-prototype" RANLIB=/bin/
79
79
make -j libz.a
80
80
81
81
# Build and install libcxxabi and libcxx.
82
- if [[ ! -d ${LIBCXX_BUILD} ]]; then
82
+ if [[ ! -f ${LLVM_BUILD} /build.ninja ]]; then
83
+ rm -rf ${LIBCXX_BUILD}
83
84
mkdir -p ${LIBCXX_BUILD}
84
85
cd ${LIBCXX_BUILD}
85
86
LIBCXX_FLAGS=" ${FLAGS} -Wno-macro-redefined"
86
87
cmake -GNinja \
87
88
-DLLVM_ENABLE_RUNTIMES=" libcxx;libcxxabi" \
88
89
-DCMAKE_BUILD_TYPE=Release \
90
+ -DCMAKE_C_COMPILER_WORKS=ON \
91
+ -DCMAKE_CXX_COMPILER_WORKS=ON \
89
92
-DCMAKE_C_COMPILER=$CC \
90
93
-DCMAKE_CXX_COMPILER=$CXX \
91
94
-DCMAKE_C_FLAGS_RELEASE=" ${LIBCXX_FLAGS} " \
@@ -108,13 +111,17 @@ LLVM_CFLAGS="${FLAGS} -Wno-global-constructors"
108
111
LLVM_CXXFLAGS=" ${LLVM_CFLAGS} -nostdinc++ -I${ZLIB_BUILD} -isystem ${LIBCXX_BUILD} /include -isystem ${LIBCXX_BUILD} /include/c++/v1"
109
112
110
113
# Build LLVM.
111
- if [[ ! -d ${LLVM_BUILD} ]]; then
114
+ if [[ ! -f ${LLVM_BUILD} /build.ninja ]]; then
115
+ rm -rf ${LLVM_BUILD}
112
116
mkdir -p ${LLVM_BUILD}
113
117
cd ${LLVM_BUILD}
114
118
cmake -GNinja \
115
119
-DCMAKE_BUILD_TYPE=Release \
120
+ -DCMAKE_C_COMPILER_WORKS=ON \
121
+ -DCMAKE_CXX_COMPILER_WORKS=ON \
116
122
-DCMAKE_C_COMPILER=$CC \
117
123
-DCMAKE_CXX_COMPILER=$CXX \
124
+ -DLLVM_ENABLE_LIBCXX=ON \
118
125
-DCMAKE_C_FLAGS=" ${LLVM_CFLAGS} " \
119
126
-DCMAKE_CXX_FLAGS=" ${LLVM_CXXFLAGS} " \
120
127
-DCMAKE_EXE_LINKER_FLAGS=" $LINKFLAGS -stdlib=libc++ -L${LIBCXX_BUILD} /lib" \
You can’t perform that action at this time.
0 commit comments