From f045e19ddc4e66d7b355b963e9db5da0f1644ef0 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 1 Dec 2018 11:36:17 -0800
Subject: [PATCH] Remove version info from llvm/criterion install directory

---
 sdk/bpf/.gitignore         |  4 ++--
 sdk/bpf/bpf.mk             |  8 ++++----
 sdk/bpf/scripts/install.sh | 28 +++++++++++++++-------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/sdk/bpf/.gitignore b/sdk/bpf/.gitignore
index 467934945d..bc0e7e7b5c 100644
--- a/sdk/bpf/.gitignore
+++ b/sdk/bpf/.gitignore
@@ -1,2 +1,2 @@
-/criterion-*
-/llvm/native-*
+/criterion
+/llvm/native
diff --git a/sdk/bpf/bpf.mk b/sdk/bpf/bpf.mk
index 34d3dc40c1..6f9b11bee8 100644
--- a/sdk/bpf/bpf.mk
+++ b/sdk/bpf/bpf.mk
@@ -16,7 +16,7 @@ OUT_DIR ?= ./out
 ifeq ($(DOCKER),1)
 LLVM_DIR = $(LOCAL_PATH)llvm/docker
 else
-LLVM_DIR = $(LOCAL_PATH)llvm/native-v0.0.1
+LLVM_DIR = $(LOCAL_PATH)llvm/native
 endif
 
 ifdef LLVM_DIR
@@ -61,11 +61,11 @@ OBJ_DUMP_FLAGS := \
   -source \
   -disassemble \
 
-TESTFRAMEWORK_RPATH := $(abspath $(LOCAL_PATH)criterion-v2.3.2/lib)
+TESTFRAMEWORK_RPATH := $(abspath $(LOCAL_PATH)criterion/lib)
 TESTFRAMEWORK_FLAGS := \
   -DSOL_TEST \
-  -isystem $(LOCAL_PATH)criterion-v2.3.2/include \
-  -L $(LOCAL_PATH)criterion-v2.3.2/lib \
+  -isystem $(LOCAL_PATH)criterion/include \
+  -L $(LOCAL_PATH)criterion/lib \
   -rpath $(TESTFRAMEWORK_RPATH) \
   -lcriterion \
 
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index f47790762a..cba90d1e78 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -2,10 +2,9 @@
 
 cd "$(dirname "$0")"/..
 
-# Install Criterion for all supported platforms
-# if changing version here must also change in bpf.mk
+# Install Criterion
 version=v2.3.2
-if [[ ! -d criterion-$version ]]; then
+if [[ ! -r criterion/README.md ]]; then
   (
     if [[ "$(uname)" = Darwin ]]; then
       machine=osx
@@ -14,24 +13,26 @@ if [[ ! -d criterion-$version ]]; then
     fi
 
     set -ex
+    rm -rf criterion
+    mkdir criterion
+    cd criterion
     wget --progress=dot:mega https://github.com/Snaipe/Criterion/releases/download/$version/criterion-$version-$machine-x86_64.tar.bz2
-    tar jxf criterion-$version-$machine-x86_64.tar.bz2
+    tar --strip-components 1 -jxf criterion-$version-$machine-x86_64.tar.bz2
     rm -rf criterion-$version-$machine-x86_64.tar.bz2
 
-    [[ ! -f criterion-$version/README.md ]]
-    echo "https://github.com/Snaipe/Criterion/releases/tag/$version" > criterion-$version/README.md
+    [[ ! -f README.md ]]
+    echo "https://github.com/Snaipe/Criterion/releases/tag/$version" > README.md
   )
   # shellcheck disable=SC2181
   if [[ $? -ne 0 ]]; then
-    rm -rf criterion-$version*
+    rm -rf criterion
     exit 1
   fi
 fi
 
 # Install LLVM
-# if changing version here must also change in bpf.mk
 version=v0.0.1
-if [[ ! -d llvm/native-$version ]]; then
+if [[ ! -f llvm/native/README.md ]]; then
   (
     if [[ "$(uname)" = Darwin ]]; then
       machine=macos
@@ -40,19 +41,20 @@ if [[ ! -d llvm/native-$version ]]; then
     fi
 
     set -ex
-    mkdir -p llvm/native-$version
-    cd llvm/native-$version
+    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-$version/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-$version
+    rm -rf llvm/native
     exit 1
   fi
 fi