Changeset 29772

Timestamp:

2012-01-18T05:03:15+01:00 (6 years ago)

Author:

jow

Message:

[scripts] ext-toolchain.sh: properly handle toolchains without sysroot support

File:

• trunk/scripts/ext-toolchain.sh (modified) (3 diffs)

trunk/scripts/ext-toolchain.sh

@@ -90 +90 @@
 test_uclibc() {
         local sysroot="$("$CC" $CFLAGS -print-sysroot 2>/dev/null)"
-        if [ -d "$sysroot" ]; then
+        if [ -d "${sysroot:-$TOOLCHAIN}" ]; then
                 local lib
-                for lib in "$sysroot"/{lib,usr/lib,usr/local/lib}/ld-uClibc*.so*; do
+                for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld-uClibc*.so*; do
                         if [ -f "$lib" ] && [ ! -h "$lib" ]; then
                                 return 0
@@ -125 +125 @@
         local sysroot="$("$CC" "$@" -muclibc -print-sysroot 2>/dev/null)"
         for inc in "include" "usr/include" "usr/local/include"; do
-                local conf="$sysroot/$inc/bits/uClibc_config.h"
+                local conf="${sysroot:-$TOOLCHAIN}/$inc/bits/uClibc_config.h"
                 if [ -f "$conf" ]; then
                         case "$feature" in
@@ -175 +175 @@
                 local bindir bindirs
                 for bindir in $(
-                        echo "$sysroot/bin";
-                        echo "$sysroot/usr/bin";
-                        echo "$sysroot/usr/local/bin";
-                        echo "$TOOLCHAIN/bin";
-                        echo "$TOOLCHAIN/usr/bin";
-                        echo "$TOOLCHAIN/usr/local/bin";
+                        echo "${sysroot:-$TOOLCHAIN}/bin";
+                        echo "${sysroot:-$TOOLCHAIN}/usr/bin";
+                        echo "${sysroot:-$TOOLCHAIN}/usr/local/bin";
                         "$CPP" $CFLAGS -v -x c /dev/null 2>&1 | \
                                 sed -ne 's#:# #g; s#^COMPILER_PATH=##p'