From 51112559421aa682712747ac3cf156bad5d4aee5 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sun, 2 Dec 2018 20:30:13 -0800
Subject: [PATCH] Map native filesystem to same location within docker

---
 sdk/bpf/llvm-docker/generate.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/sdk/bpf/llvm-docker/generate.sh b/sdk/bpf/llvm-docker/generate.sh
index 0afc5c0c5c..db244613b0 100755
--- a/sdk/bpf/llvm-docker/generate.sh
+++ b/sdk/bpf/llvm-docker/generate.sh
@@ -3,12 +3,17 @@
 read -r -d '' SCRIPT << 'EOM'
 #!/usr/bin/env bash
 set -e
-WORKDIR=$( pwd )
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
-docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"
+PROGRAM=$(basename "$0")
+SDKROOT="$(cd "$(dirname "$0")"/../..; pwd -P)"
+[[ -z $V ]] || set -x
+exec docker run \
+  --workdir "$PWD" \
+  --volume "$PWD:$PWD" \
+  --volume "$SDKROOT:$SDKROOT" \
+  --rm solanalabs/llvm \
+  "$PROGRAM" "$@"
 EOM
 
-echo "$SCRIPT" > bin/clang
-echo "$SCRIPT" > bin/clang++
-echo "$SCRIPT" > bin/llc
-echo "$SCRIPT" > bin/llvm-objdump
+for program in clang clang++ llc llvm-objdump; do
+  echo "$SCRIPT" > bin/$program
+done