Avoid unnecessary llvm/ subdirectory
This commit is contained in:
parent
f045e19ddc
commit
ee9255cb1d
|
@ -1,2 +1,2 @@
|
||||||
/criterion
|
/criterion
|
||||||
/llvm/native
|
/llvm-native
|
||||||
|
|
|
@ -14,9 +14,9 @@ TEST_DIR ?= ./test
|
||||||
OUT_DIR ?= ./out
|
OUT_DIR ?= ./out
|
||||||
|
|
||||||
ifeq ($(DOCKER),1)
|
ifeq ($(DOCKER),1)
|
||||||
LLVM_DIR = $(LOCAL_PATH)llvm/docker
|
LLVM_DIR = $(LOCAL_PATH)llvm-docker
|
||||||
else
|
else
|
||||||
LLVM_DIR = $(LOCAL_PATH)llvm/native
|
LLVM_DIR = $(LOCAL_PATH)llvm-native
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef LLVM_DIR
|
ifdef LLVM_DIR
|
||||||
|
|
|
@ -32,7 +32,7 @@ fi
|
||||||
|
|
||||||
# Install LLVM
|
# Install LLVM
|
||||||
version=v0.0.1
|
version=v0.0.1
|
||||||
if [[ ! -f llvm/native/README.md ]]; then
|
if [[ ! -f llvm-native/README.md ]]; then
|
||||||
(
|
(
|
||||||
if [[ "$(uname)" = Darwin ]]; then
|
if [[ "$(uname)" = Darwin ]]; then
|
||||||
machine=macos
|
machine=macos
|
||||||
|
@ -41,20 +41,20 @@ if [[ ! -f llvm/native/README.md ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
rm -rf llvm/native
|
rm -rf llvm-native
|
||||||
mkdir -p llvm/native
|
mkdir -p llvm-native
|
||||||
cd llvm/native
|
cd llvm-native
|
||||||
wget --progress=dot:giga https://github.com/solana-labs/llvm-builder/releases/download/$version/solana-llvm-$machine.tgz
|
wget --progress=dot:giga https://github.com/solana-labs/llvm-builder/releases/download/$version/solana-llvm-$machine.tgz
|
||||||
tar xzf solana-llvm-$machine.tgz
|
tar xzf solana-llvm-$machine.tgz
|
||||||
rm -rf solana-llvm-$machine.tgz
|
rm -rf solana-llvm-$machine.tgz
|
||||||
|
|
||||||
[[ ! -f llvm/native/README.md ]]
|
[[ ! -f llvm-native/README.md ]]
|
||||||
echo "https://github.com/solana-labs/llvm-builder/releases/tag/$version" > README.md
|
echo "https://github.com/solana-labs/llvm-builder/releases/tag/$version" > README.md
|
||||||
)
|
)
|
||||||
|
|
||||||
# shellcheck disable=SC2181
|
# shellcheck disable=SC2181
|
||||||
if [[ $? -ne 0 ]]; then
|
if [[ $? -ne 0 ]]; then
|
||||||
rm -rf llvm/native
|
rm -rf llvm-native
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue