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