Finalize cross compiler config for wrapper scripts

+ Add support for the Linaro toolchain in our current version of
buildroot

+ Fix the support for the "built-in" toolchain that comes from Ubuntu
16.04

Author: Jason Mobarak

bin/arm-linux-gnueabihf-clang

@@ -1,12 +1,43 @@
 #!/bin/bash
 
-D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
-R=$D/sysroot
+if [[ "${LLVM_OBF_USE_BR_TOOLCHAIN}" ]]; then
+
+  T=${HOST_DIR}/opt/ext-toolchain
+  export LD_LIBRARY_PATH="${T}/lib/gcc/arm-linux-gnueabihf/6.2.1"
+
+  TOOLCHAIN_OPTS="\
+    --sysroot=${T}/arm-linux-gnueabihf/libc \
+    \
+    -fuse-ld=${T}/arm-linux-gnueabihf/bin/ld \
+    \
+    -B ${T}/lib/gcc/arm-linux-gnueabihf/6.2.1/ \
+    \
+    -L ${T}/lib/gcc/arm-linux-gnueabihf/6.2.1/ \
+    -L /piksi_buildroot/buildroot/host_output/host/opt/ext-toolchain/lib/gcc/i686-pc-linux-gnu/4.7.2"
+
+else
+
+  D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
+  R=$D/sysroot
+
+  export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu"
+
+  TOOLCHAIN_OPTS="\
+    \
+    -fuse-ld=${R}/usr/arm-linux-gnueabihf/bin/ld \
+    --sysroot=${R} \
+    \
+    -B ${R}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8 \
+    \
+    -I ${R}/usr/arm-linux-gnueabihf/include \
+    \
+    -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"
+fi
 
 ${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 \
+  ${TOOLCHAIN_OPTS} \
   -ccc-gcc-name arm-linux-gnueabihf-gcc \
   --target=arm-linux-gnueabihf \
   -mfloat-abi=hard \

bin/arm-linux-gnueabihf-clang++

@@ -1,15 +1,48 @@
 #!/bin/bash
 
-D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
-R=$D/sysroot
+if [[ "${LLVM_OBF_USE_BR_TOOLCHAIN}" ]]; then
+
+  T=${HOST_DIR}/opt/ext-toolchain
+  export LD_LIBRARY_PATH="${T}/lib/gcc/arm-linux-gnueabihf/6.2.1"
+
+  TOOLCHAIN_OPTS="\
+    --sysroot=${T}/arm-linux-gnueabihf/libc \
+    \
+    -fuse-ld=${T}/arm-linux-gnueabihf/bin/ld \
+    \
+    -B ${T}/lib/gcc/arm-linux-gnueabihf/6.2.1/ \
+    \
+    -I ${T}/arm-linux-gnueabihf/include/c++/6.2.1/ \
+    -I ${T}/arm-linux-gnueabihf/include/c++/6.2.1/arm-linux-gnueabihf/ \
+    \
+    -L ${T}/lib/gcc/arm-linux-gnueabihf/6.2.1/ \
+    -L /piksi_buildroot/buildroot/host_output/host/opt/ext-toolchain/lib/gcc/i686-pc-linux-gnu/4.7.2"
+
+else
+
+  D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
+  R=$D/sysroot
+
+  export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu"
+
+  TOOLCHAIN_OPTS="\
+    \
+    -fuse-ld=${R}/usr/arm-linux-gnueabihf/bin/ld \
+    --sysroot=${R} \
+    \
+    -B ${R}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8 \
+    \
+    -I ${R}/usr/arm-linux-gnueabihf/include \
+    -I ${R}/usr/arm-linux-gnueabihf/include/c++/4.8.5 \
+    -I ${R}/usr/arm-linux-gnueabihf/include/c++/4.8.5/arm-linux-gnueabihf \
+    \
+    -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"
+fi
 
 ${D}/bin/clang++ \
-  -I ${R}/usr/arm-linux-gnueabihf/include \
-  -L ${R}/usr/arm-linux-gnueabi/libhf \
-  -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 \
+  ${TOOLCHAIN_OPTS} \
   -ccc-gcc-name arm-linux-gnueabihf-gcc \
   --target=arm-linux-gnueabihf \
   -mfloat-abi=hard \

stage_sysroot.bash

@@ -10,12 +10,9 @@ stage_sysroot() {
   mkdir -p "$OUT"
 
   SYSROOT_DIRS=(
-    "/usr/arm-linux-gnueabihf/include"
-    "/usr/arm-linux-gnueabi/libhf"
-    "/usr/arm-linux-gnueabihf/include/c++/4.8.5"
+    "/usr/arm-linux-gnueabihf"
+    "/usr/arm-linux-gnueabi"
     "/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
@@ -47,6 +44,14 @@ stage_sysroot() {
   for BINTOOL in ${BINTOOLS[@]}; do
     cp -v ${BINTOOL} "${OUT}/usr/bin/"
   done
+
+  D="${OUT}/usr/lib/x86_64-linux-gnu/"
+
+  mkdir -p "$D"
+
+  for ARMHF in /usr/lib/x86_64-linux-gnu/*armhf*; do
+    cp -v "${ARMHF}" "$D/"
+  done
 }
 
 run() {