Răsfoiți Sursa

[libc++] Make sure we use new/delete from libc++abi on CI for Apple platforms

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@358524 91177308-0d34-0410-b5e6-96231b3b80d8
Louis Dionne 6 ani în urmă
părinte
comite
08c6f59615
1 a modificat fișierele cu 2 adăugiri și 0 ștergeri
  1. 2 0
      utils/ci/macos-trunk.sh

+ 2 - 0
utils/ci/macos-trunk.sh

@@ -121,6 +121,7 @@ mkdir -p "${LIBCXX_BUILD_DIR}"
     -DLLVM_PATH="${LLVM_ROOT}" \
     -DLLVM_PATH="${LLVM_ROOT}" \
     -DCMAKE_INSTALL_PREFIX="${LIBCXX_INSTALL_DIR}" \
     -DCMAKE_INSTALL_PREFIX="${LIBCXX_INSTALL_DIR}" \
     -DLIBCXX_ENABLE_EXCEPTIONS="${LIBCXX_EXCEPTIONS}" \
     -DLIBCXX_ENABLE_EXCEPTIONS="${LIBCXX_EXCEPTIONS}" \
+    -DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=OFF \
     -DLLVM_LIT_ARGS="${LIT_FLAGS}" \
     -DLLVM_LIT_ARGS="${LIT_FLAGS}" \
     -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" # Build a universal dylib
     -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" # Build a universal dylib
 )
 )
@@ -135,6 +136,7 @@ mkdir -p "${LIBCXXABI_BUILD_DIR}"
     -DLLVM_PATH="${LLVM_ROOT}" \
     -DLLVM_PATH="${LLVM_ROOT}" \
     -DCMAKE_INSTALL_PREFIX="${LIBCXXABI_INSTALL_DIR}" \
     -DCMAKE_INSTALL_PREFIX="${LIBCXXABI_INSTALL_DIR}" \
     -DLIBCXXABI_ENABLE_EXCEPTIONS=ON \
     -DLIBCXXABI_ENABLE_EXCEPTIONS=ON \
+    -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=ON \
     -DLLVM_LIT_ARGS="${LIT_FLAGS}" \
     -DLLVM_LIT_ARGS="${LIT_FLAGS}" \
     -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" # Build a universal dylib
     -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" # Build a universal dylib
 )
 )