From ee9255cb1d85226fe980cd9b58c7a2dabbd07431 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 1 Dec 2018 11:40:25 -0800
Subject: [PATCH] Avoid unnecessary llvm/ subdirectory

---
 sdk/bpf/.gitignore                                   |  2 +-
 sdk/bpf/bpf.mk                                       |  4 ++--
 sdk/bpf/{llvm/docker => llvm-docker}/bin/clang       |  0
 sdk/bpf/{llvm/docker => llvm-docker}/bin/clang++     |  0
 sdk/bpf/{llvm/docker => llvm-docker}/bin/llc         |  0
 .../{llvm/docker => llvm-docker}/bin/llvm-objdump    |  0
 sdk/bpf/{llvm/docker => llvm-docker}/generate.sh     |  0
 sdk/bpf/scripts/install.sh                           | 12 ++++++------
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename sdk/bpf/{llvm/docker => llvm-docker}/bin/clang (100%)
 rename sdk/bpf/{llvm/docker => llvm-docker}/bin/clang++ (100%)
 rename sdk/bpf/{llvm/docker => llvm-docker}/bin/llc (100%)
 rename sdk/bpf/{llvm/docker => llvm-docker}/bin/llvm-objdump (100%)
 rename sdk/bpf/{llvm/docker => llvm-docker}/generate.sh (100%)

diff --git a/sdk/bpf/.gitignore b/sdk/bpf/.gitignore
index bc0e7e7b5..5961b495c 100644
--- a/sdk/bpf/.gitignore
+++ b/sdk/bpf/.gitignore
@@ -1,2 +1,2 @@
 /criterion
-/llvm/native
+/llvm-native
diff --git a/sdk/bpf/bpf.mk b/sdk/bpf/bpf.mk
index 6f9b11bee..d62b8ae98 100644
--- a/sdk/bpf/bpf.mk
+++ b/sdk/bpf/bpf.mk
@@ -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
diff --git a/sdk/bpf/llvm/docker/bin/clang b/sdk/bpf/llvm-docker/bin/clang
similarity index 100%
rename from sdk/bpf/llvm/docker/bin/clang
rename to sdk/bpf/llvm-docker/bin/clang
diff --git a/sdk/bpf/llvm/docker/bin/clang++ b/sdk/bpf/llvm-docker/bin/clang++
similarity index 100%
rename from sdk/bpf/llvm/docker/bin/clang++
rename to sdk/bpf/llvm-docker/bin/clang++
diff --git a/sdk/bpf/llvm/docker/bin/llc b/sdk/bpf/llvm-docker/bin/llc
similarity index 100%
rename from sdk/bpf/llvm/docker/bin/llc
rename to sdk/bpf/llvm-docker/bin/llc
diff --git a/sdk/bpf/llvm/docker/bin/llvm-objdump b/sdk/bpf/llvm-docker/bin/llvm-objdump
similarity index 100%
rename from sdk/bpf/llvm/docker/bin/llvm-objdump
rename to sdk/bpf/llvm-docker/bin/llvm-objdump
diff --git a/sdk/bpf/llvm/docker/generate.sh b/sdk/bpf/llvm-docker/generate.sh
similarity index 100%
rename from sdk/bpf/llvm/docker/generate.sh
rename to sdk/bpf/llvm-docker/generate.sh
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index cba90d1e7..317d091d0 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -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