[libcxx-commits] [libcxx] 3d120b6 - [libc++] Always run Ninja through xcrun in the macOS CI scripts

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-08-26T10:49:26-04:00
New Revision: 3d120b6f7be816d188bd05271fff17f0030db9b2

URL: https://github.com/llvm/llvm-project/commit/3d120b6f7be816d188bd05271fff17f0030db9b2
DIFF: https://github.com/llvm/llvm-project/commit/3d120b6f7be816d188bd05271fff17f0030db9b2.diff

LOG: [libc++] Always run Ninja through xcrun in the macOS CI scripts

Ninja isn't installed by default on OSX, so run it through xcrun to find
the one in the developer tools if needed.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/macos-trunk.sh b/libcxx/utils/ci/macos-trunk.sh
index c9c881cf730ef..f43a93e555cfd 100755
--- a/libcxx/utils/ci/macos-trunk.sh
+++ b/libcxx/utils/ci/macos-trunk.sh
@@ -109,18 +109,18 @@ echo "@@@@@@"
 
 
 echo "@@@ Building libc++.dylib and libc++abi.dylib from sources (just to make sure it works) @@@"
-ninja -C "${LLVM_BUILD_DIR}" install-cxx install-cxxabi -v
+xcrun ninja -C "${LLVM_BUILD_DIR}" install-cxx install-cxxabi -v
 echo "@@@@@@"
 
 
 echo "@@@ Running tests for libc++ @@@"
 # TODO: We should run check-cxx-abilist too
-ninja -C "${LLVM_BUILD_DIR}" check-cxx
+xcrun ninja -C "${LLVM_BUILD_DIR}" check-cxx
 echo "@@@@@@"
 
 
 echo "@@@ Running tests for libc++abi @@@"
-ninja -C "${LLVM_BUILD_DIR}" check-cxxabi
+xcrun ninja -C "${LLVM_BUILD_DIR}" check-cxxabi
 echo "@@@@@@"