solana-labs · jackcmay · Nov 30, 2018 · Nov 30, 2018 · Nov 30, 2018 · Nov 30, 2018
diff --git a/programs/bpf/c/sdk/.gitignore b/programs/bpf/c/sdk/.gitignore
@@ -1 +1,2 @@
 /criterion-*
+/llvm/native-*
diff --git a/programs/bpf/c/sdk/bpf.mk b/programs/bpf/c/sdk/bpf.mk
@@ -13,27 +13,21 @@ TEST_DIR ?= ./test
 OUT_DIR ?= ./out
 
 ifeq ($(DOCKER),1)
-LLVM_DIR = $(LOCAL_PATH)llvm/llvm-docker
+LLVM_DIR = $(LOCAL_PATH)llvm/docker
 else
-OS=$(shell uname)
-ifeq ($(OS),Darwin)
-LLVM_DIR ?= $(shell brew --prefix llvm)
-endif
+LLVM_DIR = $(LOCAL_PATH)llvm/native-v0.0.1
 endif
 
 ifdef LLVM_DIR
 CC := $(LLVM_DIR)/bin/clang
 CXX := $(LLVM_DIR)/bin/clang++
 LLC := $(LLVM_DIR)/bin/llc
 OBJ_DUMP := $(LLVM_DIR)/bin/llvm-objdump
-else
-CC := clang-7
-CXX := clang++-7
-LLC := llc-7
-OBJ_DUMP := llvm-objdump-7
 endif
 
-SYSTEM_INC_DIRS := $(LOCAL_PATH)inc
+SYSTEM_INC_DIRS := \
+  $(LOCAL_PATH)inc \
+  $(LLVM_DIR)lib/clang/8.0.0/include \
 
 C_FLAGS := \
   -Werror \
@@ -110,7 +104,6 @@ help:
 	@echo '    - Show commands while building: V=1'
 	@echo '      V=$(V)'
 	@echo '    - Use LLVM from docker: DOCKER=1'
-	@echo '      Docker image must be pulled first: docker pull solanalabs/llvm'
 	@echo '      DOCKER=$(DOCKER)'
 	@echo '    - List of include directories:'
 	@echo '      INC_DIRS=$(INC_DIRS)'

diff --git a/...rams/bpf/c/sdk/llvm/llvm-docker/bin/clang → programs/bpf/c/sdk/llvm/docker/bin/clang b/...rams/bpf/c/sdk/llvm/llvm-docker/bin/clang → programs/bpf/c/sdk/llvm/docker/bin/clang
diff --git a/...ms/bpf/c/sdk/llvm/llvm-docker/bin/clang++ → programs/bpf/c/sdk/llvm/docker/bin/clang++ b/...ms/bpf/c/sdk/llvm/llvm-docker/bin/clang++ → programs/bpf/c/sdk/llvm/docker/bin/clang++
diff --git a/programs/bpf/c/sdk/llvm/llvm-docker/bin/llc → programs/bpf/c/sdk/llvm/docker/bin/llc b/programs/bpf/c/sdk/llvm/llvm-docker/bin/llc → programs/bpf/c/sdk/llvm/docker/bin/llc
diff --git a/...f/c/sdk/llvm/llvm-docker/bin/llvm-objdump → ...ms/bpf/c/sdk/llvm/docker/bin/llvm-objdump b/...f/c/sdk/llvm/llvm-docker/bin/llvm-objdump → ...ms/bpf/c/sdk/llvm/docker/bin/llvm-objdump
diff --git a/...ms/bpf/c/sdk/llvm/llvm-docker/generate.sh → programs/bpf/c/sdk/llvm/docker/generate.sh b/...ms/bpf/c/sdk/llvm/llvm-docker/generate.sh → programs/bpf/c/sdk/llvm/docker/generate.sh
diff --git a/programs/bpf/c/sdk/scripts/install.sh b/programs/bpf/c/sdk/scripts/install.sh
@@ -3,21 +3,52 @@
 cd "$(dirname "$0")"/..
 
 # Install Criterion for all supported platforms
+# if changing version here must also change in bpf.mk
 version=v2.3.2
-(
-  [[ ! -d criterion-$version ]] || exit 0
-  set -ex
-  wget https://github.com/Snaipe/Criterion/releases/download/$version/criterion-$version-osx-x86_64.tar.bz2
-  wget https://github.com/Snaipe/Criterion/releases/download/$version/criterion-$version-linux-x86_64.tar.bz2
-  tar jxf criterion-$version-osx-x86_64.tar.bz2
-  tar jxf criterion-$version-linux-x86_64.tar.bz2
-  rm -rf criterion-$version-osx-x86_64.tar.bz2 criterion-$version-linux-x86_64.tar.bz2
+if [[ ! -d criterion-$version ]]; then
+  (
+    [[ ! -d criterion-$version ]] || exit 0
+    set -ex
+    wget https://github.com/Snaipe/Criterion/releases/download/$version/criterion-$version-osx-x86_64.tar.bz2
+    wget https://github.com/Snaipe/Criterion/releases/download/$version/criterion-$version-linux-x86_64.tar.bz2
+    tar jxf criterion-$version-osx-x86_64.tar.bz2
+    tar jxf criterion-$version-linux-x86_64.tar.bz2
+    rm -rf criterion-$version-osx-x86_64.tar.bz2 criterion-$version-linux-x86_64.tar.bz2
 
-  [[ ! -f criterion-$version/README.md ]]
-  echo "https://github.com/Snaipe/Criterion/releases/tag/$version" > criterion-$version/README.md
-)
+    [[ ! -f criterion-$version/README.md ]]
+    echo "https://github.com/Snaipe/Criterion/releases/tag/$version" > criterion-$version/README.md
+  )
+  # shellcheck disable=SC2181
+  if [[ $? -ne 0 ]]; then
+    rm -rf criterion-$version*
+    exit 1
+  fi
+fi
+
+# Install LLVM
+# if changing version here must also change in bpf.mk
+version=v0.0.1
+if [ "$(uname)" == "Darwin" ]; then
+  machine=macos
+else
+  machine=linux
+fi
+if [[ ! -d llvm/native-$version ]]; then
+  (
+    set -ex
+    mkdir -p llvm/native-$version
+    cd llvm/native-$version
+    wget 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 ]]
+    echo "https://github.com/solana-labs/solana-web3.js/releases/tag/$version" > README.md
+  )
+fi
 # shellcheck disable=SC2181
 if [[ $? -ne 0 ]]; then
-  rm -rf criterion-$version*
+  rm -rf llvm/native-$version
   exit 1
 fi
+
diff --git a/programs/bpf/c/sdk/scripts/package.sh b/programs/bpf/c/sdk/scripts/package.sh
@@ -12,8 +12,7 @@ mkdir bpf-sdk/
   git rev-parse HEAD
 ) > bpf-sdk/version.txt
 
-"$SOLANA_ROOT"/programs/bpf/c/sdk/scripts/install.sh
 cp -ra "$SOLANA_ROOT"/programs/bpf/c/sdk/* bpf-sdk/
-rm -rf bpf-sdk/scripts/
+rm -rf bpf-sdk/scripts/package.sh
 
 tar jvcf bpf-sdk.tar.bz2 bpf-sdk/
diff --git a/sdk/docker-llvm/Dockerfile b/sdk/docker-llvm/Dockerfile
diff --git a/sdk/docker-llvm/README.md b/sdk/docker-llvm/README.md
diff --git a/sdk/docker-llvm/build.sh b/sdk/docker-llvm/build.sh