Fix example compilation

swift-nav · May 8, 2018 · 9fa51d8 · 9fa51d8
1 parent af22bf9
commit 9fa51d8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/bin/arm-linux-gnueabihf-clang b/bin/arm-linux-gnueabihf-clang
@@ -14,12 +14,16 @@ D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
 
 if [[ -z "${BR2_TOOLCHAIN_PATH:-}" ]]; then
   T=${HOST_DIR}/opt/ext-toolchain
+  if [[ -z "${LD_LIBRARY_PATH:-}" ]]; then
+    export LD_LIBRARY_PATH="${T}/lib"
+  else
+    export LD_LIBRARY_PATH="${T}/lib:$LD_LIBRARY_PATH"
+  fi
 else
+  export LD_LIBRARY_PATH=${BR2_TOOLCHAIN_LD_LIBRARY_PATH}
   T=${BR2_TOOLCHAIN_PATH}
 fi
 
-export LD_LIBRARY_PATH="${T}/lib:$LD_LIBRARY_PATH"
-
 toolchain_prefix="arm-buildroot-linux-gnueabihf"
 toolchain_version="6.4.0"
 

diff --git a/bin/arm-linux-gnueabihf-clang++ b/bin/arm-linux-gnueabihf-clang++
@@ -14,7 +14,13 @@ D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
 
 if [[ -z "${BR2_TOOLCHAIN_PATH:-}" ]]; then
   T=${HOST_DIR}/opt/ext-toolchain
+  if [[ -z "${LD_LIBRARY_PATH:-}" ]]; then
+    export LD_LIBRARY_PATH="${T}/lib"
+  else
+    export LD_LIBRARY_PATH="${T}/lib:$LD_LIBRARY_PATH"
+  fi
 else
+  export LD_LIBRARY_PATH=${BR2_TOOLCHAIN_LD_LIBRARY_PATH}
   T=${BR2_TOOLCHAIN_PATH}
 fi
 

diff --git a/build_example.bash b/build_example.bash
@@ -14,6 +14,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 DOCKER_NAMETAG=$(cat docker_nametag)
+BR2_TOOLCHAIN_LD_LIBRARY_PATH=/toolchain/x86/x86_64-buildroot-linux-gnu/lib64
 
 mkdir -p output/opt
 
@@ -41,6 +42,9 @@ docker run ${INTERACTIVE[@]:-} --rm \
     -v "$PWD/output/opt:/opt" \
     -v obfuscator-llvm:/work/obfuscator-llvm \
     -v obfuscator-llvm-build:/work/build \
+    -e BR2_TOOLCHAIN_PATH=/toolchain/arm \
     "$DOCKER_NAMETAG" \
     /bin/bash -c "export PATH=/opt/llvm-obfuscator/bin:/opt/llvm-obfuscator/wrappers/bin:\$PATH; \
+                  export BR2_TOOLCHAIN_PATH=/toolchain/arm; \
+                  export BR2_TOOLCHAIN_LD_LIBRARY_PATH=$BR2_TOOLCHAIN_LD_LIBRARY_PATH; \
                   make -C example"
diff --git a/run_build_shell.bash b/run_build_shell.bash
@@ -14,6 +14,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 DOCKER_NAMETAG=$(cat docker_nametag)
+BR2_TOOLCHAIN_LD_LIBRARY_PATH=/toolchain/x86/x86_64-buildroot-linux-gnu/lib64
 
 mkdir -p output/opt
 
@@ -29,4 +30,6 @@ docker run -i -t --rm \
     /bin/bash -c "export PATH=/opt/llvm-obfuscator/bin:/opt/llvm-obfuscator/wrappers/bin:\$PATH; \
                   cp -v /this_dir/cpp_wrapper.c /work/cpp_wrapper.c \
                   && gcc -std=c99 -O3 -Wall /work/cpp_wrapper.c -o /bin/cpp_wrapper; \
+                  export BR2_TOOLCHAIN_PATH=/toolchain/arm; \
+                  export BR2_TOOLCHAIN_LD_LIBRARY_PATH=$BR2_TOOLCHAIN_LD_LIBRARY_PATH; \
                   exec /bin/bash"