From 2a82fa3a6213338f5a6a99d2265aa36be7fc5330 Mon Sep 17 00:00:00 2001 From: jumormt Date: Wed, 7 Feb 2024 20:25:48 +1100 Subject: [PATCH 1/5] test brew install prefix --- build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 700ec93a8..6cc36cb50 100755 --- a/build.sh +++ b/build.sh @@ -177,7 +177,7 @@ if [[ ! -d "$LLVM_DIR" ]]; then if [[ ! -d "$LLVMHome" ]]; then if [[ "$sysOS" = "Darwin" ]]; then echo "Installing LLVM binary for $OSDisplayName" - brew install llvm@${MajorLLVMVer} + brew install llvm@${MajorLLVMVer} --prefix=${SVFHOME}/${LLVMHome} # check whether llvm is installed if [ $? -eq 0 ]; then echo "LLVM binary installation completed." @@ -185,17 +185,16 @@ if [[ ! -d "$LLVM_DIR" ]]; then echo "LLVM binary installation failed." exit 1 fi - export LLVM_DIR="$(brew --prefix llvm@${MajorLLVMVer})" else # everything else downloads pre-built lib includ osx "arm64" echo "Downloading LLVM binary for $OSDisplayName" generic_download_file "$urlLLVM" llvm.tar.xz - check_xz + check_xzb echo "Unzipping llvm package..." mkdir -p "./$LLVMHome" && tar -xf llvm.tar.xz -C "./$LLVMHome" --strip-components 1 rm llvm.tar.xz - export LLVM_DIR="$SVFHOME/$LLVMHome" fi + export LLVM_DIR="$SVFHOME/$LLVMHome" fi fi From cb76014c16e51f3b5b5e6f0f8b47a3abff61eff3 Mon Sep 17 00:00:00 2001 From: jumormt Date: Wed, 7 Feb 2024 20:30:03 +1100 Subject: [PATCH 2/5] test brew install prefix --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 6cc36cb50..a2a28cbb2 100755 --- a/build.sh +++ b/build.sh @@ -189,7 +189,7 @@ if [[ ! -d "$LLVM_DIR" ]]; then # everything else downloads pre-built lib includ osx "arm64" echo "Downloading LLVM binary for $OSDisplayName" generic_download_file "$urlLLVM" llvm.tar.xz - check_xzb + check_xz echo "Unzipping llvm package..." mkdir -p "./$LLVMHome" && tar -xf llvm.tar.xz -C "./$LLVMHome" --strip-components 1 rm llvm.tar.xz From 56bcc0cf4a78077fcb9ddbeafd122d06e967f95d Mon Sep 17 00:00:00 2001 From: jumormt Date: Wed, 7 Feb 2024 20:35:30 +1100 Subject: [PATCH 3/5] test brew install prefix --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a2a28cbb2..308ff3560 100755 --- a/build.sh +++ b/build.sh @@ -177,7 +177,7 @@ if [[ ! -d "$LLVM_DIR" ]]; then if [[ ! -d "$LLVMHome" ]]; then if [[ "$sysOS" = "Darwin" ]]; then echo "Installing LLVM binary for $OSDisplayName" - brew install llvm@${MajorLLVMVer} --prefix=${SVFHOME}/${LLVMHome} + brew install llvm@${MajorLLVMVer} # check whether llvm is installed if [ $? -eq 0 ]; then echo "LLVM binary installation completed." @@ -185,6 +185,7 @@ if [[ ! -d "$LLVM_DIR" ]]; then echo "LLVM binary installation failed." exit 1 fi + ln -s $(brew --prefix llvm@16)/* $SVFHOME/$LLVMHome else # everything else downloads pre-built lib includ osx "arm64" echo "Downloading LLVM binary for $OSDisplayName" From fb79115e5305ba4e92f211680c8aac325cdf50c2 Mon Sep 17 00:00:00 2001 From: jumormt Date: Wed, 7 Feb 2024 20:39:17 +1100 Subject: [PATCH 4/5] test brew install prefix --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 308ff3560..a07faf697 100755 --- a/build.sh +++ b/build.sh @@ -185,6 +185,7 @@ if [[ ! -d "$LLVM_DIR" ]]; then echo "LLVM binary installation failed." exit 1 fi + mkdir -p $SVFHOME/$LLVMHome ln -s $(brew --prefix llvm@16)/* $SVFHOME/$LLVMHome else # everything else downloads pre-built lib includ osx "arm64" From 1910ec2194a063c28e03b886021bf5a825c9b1a8 Mon Sep 17 00:00:00 2001 From: jumormt Date: Wed, 7 Feb 2024 20:50:47 +1100 Subject: [PATCH 5/5] test brew install prefix --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a07faf697..083850436 100755 --- a/build.sh +++ b/build.sh @@ -186,7 +186,7 @@ if [[ ! -d "$LLVM_DIR" ]]; then exit 1 fi mkdir -p $SVFHOME/$LLVMHome - ln -s $(brew --prefix llvm@16)/* $SVFHOME/$LLVMHome + ln -s $(brew --prefix llvm@${MajorLLVMVer})/* $SVFHOME/$LLVMHome else # everything else downloads pre-built lib includ osx "arm64" echo "Downloading LLVM binary for $OSDisplayName"