diff --git a/build-lldb-mi.sh b/build-lldb-mi.sh index ebc4db0..1dd6b13 100755 --- a/build-lldb-mi.sh +++ b/build-lldb-mi.sh @@ -65,7 +65,7 @@ else esac fi -export LLVM_DIR="$PREFIX" +LLVM_DIR="$PREFIX" # Try to find/guess the builddir under the llvm buildtree next by. # If LLVM was built without LLVM_INSTALL_TOOLCHAIN_ONLY, and the LLVM @@ -91,7 +91,7 @@ if [ -d "$LLVM_SRC" ]; then done if [ -n "$DIRS" ]; then dir="$(ls -td $DIRS | head -1)" - export LLVM_DIR="$LLVM_SRC/$dir" + LLVM_DIR="$LLVM_SRC/$dir" echo Using $LLVM_DIR as LLVM build dir break else @@ -121,14 +121,14 @@ if [ -n "$HOST" ]; then exit 1 ;; esac - - CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH=$LLVM_DIR" - CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER" - CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY" - CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY" - CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY" fi +CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH=$LLVM_DIR" +CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER" +CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY" +CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY" +CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY" + if [ -n "$MACOS_REDIST" ]; then : ${MACOS_REDIST_ARCHS:=arm64 x86_64} : ${MACOS_REDIST_VERSION:=10.12}