domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 29772
This commit is contained in:
Jo-Philipp Wich
2012-01-18 04:03:15 +00:00
parent 25630dd5a5
commit 989c73848f
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/ext-toolchain.sh
View File

@@ -89,9 +89,9 @@ test_softfloat() {
test_uclibc() { test_uclibc() {
local sysroot="$("$CC" $CFLAGS -print-sysroot 2>/dev/null)" local sysroot="$("$CC" $CFLAGS -print-sysroot 2>/dev/null)"
if [ -d "$sysroot" ]; then if [ -d "${sysroot:-$TOOLCHAIN}" ]; then
local lib 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 if [ -f "$lib" ] && [ ! -h "$lib" ]; then
return 0 return 0
fi fi
@@ -124,7 +124,7 @@ test_feature() {
local inc local inc
local sysroot="$("$CC" "$@" -muclibc -print-sysroot 2>/dev/null)" local sysroot="$("$CC" "$@" -muclibc -print-sysroot 2>/dev/null)"
for inc in "include" "usr/include" "usr/local/include"; do 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 if [ -f "$conf" ]; then
case "$feature" in case "$feature" in
lfs) grep -q '__UCLIBC_HAS_LFS__ 1' "$conf"; return $?;; lfs) grep -q '__UCLIBC_HAS_LFS__ 1' "$conf"; return $?;;
@@ -174,12 +174,9 @@ find_bins() {
local bindir bindirs local bindir bindirs
for bindir in $( for bindir in $(
echo "$sysroot/bin"; echo "${sysroot:-$TOOLCHAIN}/bin";
echo "$sysroot/usr/bin"; echo "${sysroot:-$TOOLCHAIN}/usr/bin";
echo "$sysroot/usr/local/bin"; echo "${sysroot:-$TOOLCHAIN}/usr/local/bin";
echo "$TOOLCHAIN/bin";
echo "$TOOLCHAIN/usr/bin";
echo "$TOOLCHAIN/usr/local/bin";
"$CPP" $CFLAGS -v -x c /dev/null 2>&1 | \ "$CPP" $CFLAGS -v -x c /dev/null 2>&1 | \
sed -ne 's#:# #g; s#^COMPILER_PATH=##p' sed -ne 's#:# #g; s#^COMPILER_PATH=##p'
); do ); do