[libcxx-commits] [libcxx] 1ffc299 - [libc++] Ensure the CI scripts can find Ninja

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-08-13T11:11:10-04:00
New Revision: 1ffc299628948ee0bee3ffb7451c9085b5a80e83

URL: https://github.com/llvm/llvm-project/commit/1ffc299628948ee0bee3ffb7451c9085b5a80e83
DIFF: https://github.com/llvm/llvm-project/commit/1ffc299628948ee0bee3ffb7451c9085b5a80e83.diff

LOG: [libc++] Ensure the CI scripts can find Ninja

Ninja isn't necessarily installed on macOS out of the box, so make sure
we use the SDK Ninja instead of relying on one being available on the
system.

Added: 
    

Modified: 
    libcxx/utils/ci/macos-backdeployment.sh
    libcxx/utils/ci/macos-trunk.sh

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/macos-backdeployment.sh b/libcxx/utils/ci/macos-backdeployment.sh
index d86337e4db37..b511faf30c9c 100755
--- a/libcxx/utils/ci/macos-backdeployment.sh
+++ b/libcxx/utils/ci/macos-backdeployment.sh
@@ -95,6 +95,7 @@ mkdir -p "${LLVM_BUILD_DIR}"
   xcrun cmake \
     -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
     -GNinja \
+    -DCMAKE_MAKE_PROGRAM="$(xcrun --find ninja)" \
     -DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}" \
     -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
     -DCMAKE_OSX_ARCHITECTURES="x86_64" \

diff  --git a/libcxx/utils/ci/macos-trunk.sh b/libcxx/utils/ci/macos-trunk.sh
index dc977db9a844..c9c881cf730e 100755
--- a/libcxx/utils/ci/macos-trunk.sh
+++ b/libcxx/utils/ci/macos-trunk.sh
@@ -95,6 +95,7 @@ mkdir -p "${LLVM_BUILD_DIR}"
   xcrun cmake \
     -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
     -GNinja \
+    -DCMAKE_MAKE_PROGRAM="$(xcrun --find ninja)" \
     -DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}" \
     -DLIBCXX_ENABLE_EXCEPTIONS="${LIBCXX_EXCEPTIONS}" \
     -DLIBCXXABI_ENABLE_EXCEPTIONS=ON \