gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Docker paths after move (#1986)

Browse Source
This commit is contained in:
jackcmay
2018-12-02 13:47:05 -08:00
committed by GitHub
parent 9594293804
commit 188904c318
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/bpf/bpf.mk
View File

@ -15,9 +15,9 @@ OUT_DIR ?= ./out
OS := $(uname) OS := $(uname)
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

7
sdk/bpf/llvm-docker/bin/clang
View File

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -e
SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../.. WORKDIR=$( pwd )
docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@" SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"

7
sdk/bpf/llvm-docker/bin/clang++
View File

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -e
SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../.. WORKDIR=$( pwd )
docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@" SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"

7
sdk/bpf/llvm-docker/bin/llc
View File

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -e
SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../.. WORKDIR=$( pwd )
docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@" SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"

7
sdk/bpf/llvm-docker/bin/llvm-objdump
View File

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -e
SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../.. WORKDIR=$( pwd )
docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@" SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"

7
sdk/bpf/llvm-docker/generate.sh
View File

@ -2,9 +2,10 @@
read -r -d '' SCRIPT << 'EOM' read -r -d '' SCRIPT << 'EOM'
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -e
SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../.. WORKDIR=$( pwd )
docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@" SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"
EOM EOM
echo "$SCRIPT" > bin/clang echo "$SCRIPT" > bin/clang