Skip to content

Commit 7d89768

Browse files
committed
[nfc][sanitizer] Use CMAKE_C_COMPILER_WORKS building symbolizer
1 parent e851ee9 commit 7d89768

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,16 @@ AR="${AR}" CC="${CC}" CFLAGS="$FLAGS -Wno-deprecated-non-prototype" RANLIB=/bin/
7979
make -j libz.a
8080

8181
# 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}
8384
mkdir -p ${LIBCXX_BUILD}
8485
cd ${LIBCXX_BUILD}
8586
LIBCXX_FLAGS="${FLAGS} -Wno-macro-redefined"
8687
cmake -GNinja \
8788
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
8889
-DCMAKE_BUILD_TYPE=Release \
90+
-DCMAKE_C_COMPILER_WORKS=ON \
91+
-DCMAKE_CXX_COMPILER_WORKS=ON \
8992
-DCMAKE_C_COMPILER=$CC \
9093
-DCMAKE_CXX_COMPILER=$CXX \
9194
-DCMAKE_C_FLAGS_RELEASE="${LIBCXX_FLAGS}" \
@@ -108,13 +111,17 @@ LLVM_CFLAGS="${FLAGS} -Wno-global-constructors"
108111
LLVM_CXXFLAGS="${LLVM_CFLAGS} -nostdinc++ -I${ZLIB_BUILD} -isystem ${LIBCXX_BUILD}/include -isystem ${LIBCXX_BUILD}/include/c++/v1"
109112

110113
# Build LLVM.
111-
if [[ ! -d ${LLVM_BUILD} ]]; then
114+
if [[ ! -f ${LLVM_BUILD}/build.ninja ]]; then
115+
rm -rf ${LLVM_BUILD}
112116
mkdir -p ${LLVM_BUILD}
113117
cd ${LLVM_BUILD}
114118
cmake -GNinja \
115119
-DCMAKE_BUILD_TYPE=Release \
120+
-DCMAKE_C_COMPILER_WORKS=ON \
121+
-DCMAKE_CXX_COMPILER_WORKS=ON \
116122
-DCMAKE_C_COMPILER=$CC \
117123
-DCMAKE_CXX_COMPILER=$CXX \
124+
-DLLVM_ENABLE_LIBCXX=ON \
118125
-DCMAKE_C_FLAGS="${LLVM_CFLAGS}" \
119126
-DCMAKE_CXX_FLAGS="${LLVM_CXXFLAGS}" \
120127
-DCMAKE_EXE_LINKER_FLAGS="$LINKFLAGS -stdlib=libc++ -L${LIBCXX_BUILD}/lib" \

0 commit comments

Comments
 (0)