Fix-ups for linker paths (#4)

Author: Jason Mobarak

bin/arm-linux-gnueabihf-clang

@@ -31,7 +31,7 @@ else
   D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
   R=$D/sysroot
 
-  export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf"
+  export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf/lib:${R}/usr/arm-linux-gnueabihf/lib"
 
   TOOLCHAIN_OPTS="\
     \
@@ -45,6 +45,11 @@ else
     -L ${R}/usr/arm-linux-gnueabi/libhf \
     -L ${R}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8 \
     -L ${R}/usr/lib/x86_64-linux-gnu \
+    -L ${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf/lib \
+    -L ${R}/usr/arm-linux-gnueabihf/lib \
+    \
+    -Wl,-rpath-link=${R}/usr/arm-linux-gnueabi/libhf \
+    \
     -Wno-unused-command-line-argument"
 fi
 

bin/arm-linux-gnueabihf-clang++

@@ -34,7 +34,7 @@ else
   D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
   R=$D/sysroot
 
-  export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf"
+  export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf/lib:${R}/usr/arm-linux-gnueabihf/lib"
 
   TOOLCHAIN_OPTS="\
     \
@@ -50,6 +50,11 @@ else
     -L ${R}/usr/arm-linux-gnueabi/libhf \
     -L ${R}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8 \
     -L ${R}/usr/lib/x86_64-linux-gnu \
+    -L ${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf/lib \
+    -L ${R}/usr/arm-linux-gnueabihf/lib \
+    \
+    -Wl,-rpath-link=${R}/usr/arm-linux-gnueabi/libhf \
+    \
     -Wno-unused-command-line-argument"
 fi
 

bin/arm-linux-gnueabihf-objcopy

@@ -13,7 +13,7 @@
 D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
 R=$D/sysroot
 
-export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf"
+export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf/lib"
 
 exec ${R}/usr/bin/arm-linux-gnueabihf-objcopy $@
 

bin/arm-linux-gnueabihf-strip

@@ -13,6 +13,6 @@
 D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
 R=$D/sysroot
 
-export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf"
+export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf/lib"
 
 exec ${R}/usr/bin/arm-linux-gnueabihf-strip $@