Merge 564d239939 into 7ff81cb10c

1 year ago · 791bcac86f
parent 7ff81cb10c 564d239939
commit 791bcac86f
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@ -191,6 +191,7 @@ build/compiler-rt.BUILT: build/llvm.BUILT
 # $(3): the name of the target being built for
 # $(4): extra compiler flags to pass
 LIBCXX_CMAKE_FLAGS = \
+    -DNDEBUG=1 \
    -DCMAKE_C_COMPILER_WORKS=ON \
    -DCMAKE_CXX_COMPILER_WORKS=ON \
    -DCMAKE_AR=$(BUILD_PREFIX)/bin/ar \
@ -211,7 +212,8 @@ LIBCXX_CMAKE_FLAGS = \
    -DLIBCXX_ENABLE_SHARED:BOOL=$(2) \
    -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF \
    -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF \
-    -DLIBCXX_ENABLE_FILESYSTEM:BOOL=ON \
+    -DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF \
+    -DLIBCXXABI_BAREMETAL=1\
    -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT:BOOL=OFF \
    -DLIBCXX_CXX_ABI=libcxxabi \
    -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$(LLVM_PROJ_DIR)/libcxxabi/include \