diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-16 20:46:03 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-16 20:46:03 +0000 |
| commit | 4b9c19e42d67c26b440a028d167e4e4b4186fb81 (patch) | |
| tree | 6b8715f6d54930d7767ed7665f7c6127ab56af33 /libcxx | |
| parent | e08783e2f54b949a1dca0b6f906f2a18b7984fc1 (diff) | |
| download | bcm5719-llvm-4b9c19e42d67c26b440a028d167e4e4b4186fb81.tar.gz bcm5719-llvm-4b9c19e42d67c26b440a028d167e4e4b4186fb81.zip | |
[libc++] Make sure we use new/delete from libc++abi on CI for Apple platforms
llvm-svn: 358524
Diffstat (limited to 'libcxx')
| -rwxr-xr-x | libcxx/utils/ci/macos-trunk.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/utils/ci/macos-trunk.sh b/libcxx/utils/ci/macos-trunk.sh index de7db0d3809..588d6c1b902 100755 --- a/libcxx/utils/ci/macos-trunk.sh +++ b/libcxx/utils/ci/macos-trunk.sh @@ -121,6 +121,7 @@ mkdir -p "${LIBCXX_BUILD_DIR}" -DLLVM_PATH="${LLVM_ROOT}" \ -DCMAKE_INSTALL_PREFIX="${LIBCXX_INSTALL_DIR}" \ -DLIBCXX_ENABLE_EXCEPTIONS="${LIBCXX_EXCEPTIONS}" \ + -DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=OFF \ -DLLVM_LIT_ARGS="${LIT_FLAGS}" \ -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" # Build a universal dylib ) @@ -135,6 +136,7 @@ mkdir -p "${LIBCXXABI_BUILD_DIR}" -DLLVM_PATH="${LLVM_ROOT}" \ -DCMAKE_INSTALL_PREFIX="${LIBCXXABI_INSTALL_DIR}" \ -DLIBCXXABI_ENABLE_EXCEPTIONS=ON \ + -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=ON \ -DLLVM_LIT_ARGS="${LIT_FLAGS}" \ -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" # Build a universal dylib ) |
