Use toolchain ld, not system ld

Author: Jason Mobarak

bin/arm-linux-gnueabihf-clang

@@ -6,6 +6,7 @@ R=$D/sysroot
 ${D}/bin/clang \
   -I ${R}/usr/arm-linux-gnueabihf/include \
   -L ${R}/usr/arm-linux-gnueabi/libhf \
+  -fuse-ld=${R}/usr/arm-linux-gnueabihf/bin/ld \
   -ccc-gcc-name arm-linux-gnueabihf-gcc \
   --target=arm-linux-gnueabihf \
   -mfloat-abi=hard \

bin/arm-linux-gnueabihf-clang++

@@ -9,6 +9,7 @@ ${D}/bin/clang++ \
   -I ${R}/usr/arm-linux-gnueabihf/include/c++/4.8.5/ \
   -L ${R}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8/ \
   -I ${R}/usr/arm-linux-gnueabihf/include/c++/4.8.5/arm-linux-gnueabihf \
+  -fuse-ld=${R}/usr/arm-linux-gnueabihf/bin/ld \
   -ccc-gcc-name arm-linux-gnueabihf-gcc \
   --target=arm-linux-gnueabihf \
   -mfloat-abi=hard \

build_example.bash

@@ -7,7 +7,6 @@ docker run -i -t --rm \
     -v $PWD/example:/work/example \
     -v $PWD/build:/work/build \
     -v $PWD/output/opt:/opt \
-    -v $PWD/bin:/wrapper-bin \
     arm-llvm-obf:base \
-    /bin/bash -c "export PATH=/opt/llvm-obfuscator/bin:/wrapper-bin:\$PATH; \
+    /bin/bash -c "export PATH=/opt/llvm-obfuscator/bin:/opt/llvm-obfuscator/wrappers/bin:\$PATH; \
                   make -C example"

stage_sysroot.bash

@@ -15,6 +15,7 @@ stage_sysroot() {
     "/usr/arm-linux-gnueabihf/include/c++/4.8.5"
     "/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8"
     "/usr/arm-linux-gnueabihf/include/c++/4.8.5/arm-linux-gnueabihf"
+    "/usr/arm-linux-gnueabihf/bin"
   )
 
   for SYSROOT_DIR in ${SYSROOT_DIRS[@]}; do
@@ -26,6 +27,26 @@ stage_sysroot() {
 
   mkdir -p $WRAPPERS_BIN
   rsync -asv '--exclude=.*.sw?' /this_dir/bin/ $WRAPPERS_BIN/
+
+  BINTOOLS=(
+    /usr/bin/arm-linux-gnueabihf-ar
+    /usr/bin/arm-linux-gnueabihf-as
+    /usr/bin/arm-linux-gnueabihf-ld
+    /usr/bin/arm-linux-gnueabihf-ld.bfd
+    /usr/bin/arm-linux-gnueabihf-ld.gold
+    /usr/bin/arm-linux-gnueabihf-nm
+    /usr/bin/arm-linux-gnueabihf-objcopy
+    /usr/bin/arm-linux-gnueabihf-objdump
+    /usr/bin/arm-linux-gnueabihf-ranlib
+    /usr/bin/arm-linux-gnueabihf-readelf
+    /usr/bin/arm-linux-gnueabihf-strip
+  )
+
+  mkdir -p "${OUT}/usr/bin/"
+
+  for BINTOOL in ${BINTOOLS[@]}; do
+    cp -v ${BINTOOL} "${OUT}/usr/bin/"
+  done
 }
 
 run() {