Remove setting of ninja path in CMake options now that we already assume it exists in $PATH

Author: light-tech

azure-pipelines.yml

@@ -21,6 +21,8 @@ jobs:
       # Download various tools such as autoconf, automake and libtool
       wget https://github.com/light-tech/LLVM-On-iOS/releases/download/llvm12.0.0/tools.tar.xz
       tar xzf tools.tar.xz
+      mv ninja tools/bin
+      export PATH=$PATH:`pwd`/tools/bin
       ./build-llvm-framework.sh maccatalyst iphoneos iphonesimulator
     displayName: 'Checkout and build llvm framework'
     enabled: true

build-llvm-framework.sh

@@ -9,7 +9,6 @@ PLATFORMS=( "$@" )
 
 # Constants
 export REPO_ROOT=`pwd`
-export PATH=$PATH:$REPO_ROOT/tools/bin
 
 # Build libffi for a given platform
 function build_libffi() {
@@ -88,8 +87,7 @@ function build_llvm() {
 		-DFFI_LIBRARY_DIR=$LIBFFI_INSTALL_DIR \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$LLVM_INSTALL_DIR \
-		-DCMAKE_TOOLCHAIN_FILE=../llvm/cmake/platforms/iOS.cmake \
-		-DCMAKE_MAKE_PROGRAM=$REPO_ROOT/ninja)
+		-DCMAKE_TOOLCHAIN_FILE=../llvm/cmake/platforms/iOS.cmake)
 
 	case $PLATFORM in
 		"iphoneos")