Add BR2_SYSROOT_BASE (#10)

* Set HOST_DIR when BR2_TOOLCHAIN_PATH is non-empty * Add BR2_SYSROOT_BASE for llvm
swift-nav · May 13, 2018 · 5a68636 · 5a68636
1 parent 474b6c1
commit 5a68636
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/bin/arm-linux-gnueabihf-clang b/bin/arm-linux-gnueabihf-clang
@@ -24,11 +24,15 @@ else
   T=${BR2_TOOLCHAIN_PATH}
 fi
 
+if [[ -z "${BR2_SYSROOT_BASE:-}" ]]; then
+  BR2_SYSROOT_BASE=${T}
+fi
+
 toolchain_prefix="arm-buildroot-linux-gnueabihf"
 toolchain_version="6.4.0"
 
 TOOLCHAIN_OPTS="\
-  --sysroot=${T}/${toolchain_prefix}/sysroot \
+  --sysroot=${BR2_SYSROOT_BASE}/${toolchain_prefix}/sysroot \
   -L ${T}/${toolchain_prefix}/lib \
   -L ${HOST_DIR}/${toolchain_prefix}/sysroot/lib \
   -L ${HOST_DIR}/${toolchain_prefix}/sysroot/usr/lib \

diff --git a/bin/arm-linux-gnueabihf-clang++ b/bin/arm-linux-gnueabihf-clang++
@@ -24,13 +24,17 @@ else
   T=${BR2_TOOLCHAIN_PATH}
 fi
 
+if [[ -z "${BR2_SYSROOT_BASE:-}" ]]; then
+  BR2_SYSROOT_BASE=${T}
+fi
+
 export LD_LIBRARY_PATH="${T}/lib:$LD_LIBRARY_PATH"
 
 toolchain_prefix="arm-buildroot-linux-gnueabihf"
 toolchain_version="6.4.0"
 
 TOOLCHAIN_OPTS="\
-  --sysroot=${T}/${toolchain_prefix}/sysroot \
+  --sysroot=${BR2_SYSROOT_BASE}/${toolchain_prefix}/sysroot \
   -I ${T}/${toolchain_prefix}/include/c++/${toolchain_version}/ \
   -I ${T}/${toolchain_prefix}/include/c++/${toolchain_version}/${toolchain_prefix} \
   -L ${T}/${toolchain_prefix}/lib \