X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fext-toolchain.sh;h=3ebaa214879e248facf5b69ac75497b51580a5f5;hb=308a3aa8affe60673e31727fa2c162dcc57e5af3;hp=23d14a7483b0abf2bf08cdda8879ce6f2fcde578;hpb=33451c5fb021f40c016a9d5344931264c275002e;p=openwrt.git

diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh
index 23d14a7483..3ebaa21487 100755
--- a/scripts/ext-toolchain.sh
+++ b/scripts/ext-toolchain.sh
@@ -197,6 +197,47 @@ find_bins() {
 }
 
 
+wrap_bin_cc() {
+	local out="$1"
+	local bin="$2"
+
+	echo    '#!/bin/sh'                                                > "$out"
+	echo    'for arg in "$@"; do'                                     >> "$out"
+	echo    ' case "$arg" in -l*|-L*|-shared|-static)'                >> "$out"
+	echo -n '  exec "'"$bin"'" '"$CFLAGS"' ${STAGING_DIR:+'           >> "$out"
+	echo -n '-idirafter "$STAGING_DIR/usr/include" '                  >> "$out"
+	echo -n '-L "$STAGING_DIR/usr/lib" '                              >> "$out"
+	echo    '-Wl,-rpath-link,"$STAGING_DIR/usr/lib"} "$@" ;;'         >> "$out"
+	echo    ' esac'                                                   >> "$out"
+	echo    'done'                                                    >> "$out"
+	echo -n 'exec "'"$bin"'" '"$CFLAGS"' ${STAGING_DIR:+'             >> "$out"
+	echo    '-idirafter "$STAGING_DIR/usr/include"} "$@"'             >> "$out"
+
+	chmod +x "$out"
+}
+
+wrap_bin_ld() {
+	local out="$1"
+	local bin="$2"
+
+	echo    '#!/bin/sh'                                                > "$out"
+	echo -n 'exec "'"$bin"'" ${STAGING_DIR:+'                         >> "$out"
+	echo -n '-L "$STAGING_DIR/usr/lib" '                              >> "$out"
+	echo    '-rpath-link "$STAGING_DIR/usr/lib"} "$@"'                >> "$out"
+
+	chmod +x "$out"
+}
+
+wrap_bin_other() {
+	local out="$1"
+	local bin="$2"
+
+	echo    '#!/bin/sh'                                                > "$out"
+	echo    'exec "'"$bin"'" "$@"'                                    >> "$out"
+
+	chmod +x "$out"
+}
+
 wrap_bins() {
 	if probe_cc; then
 		mkdir -p "$1" || return 1
@@ -212,27 +253,17 @@ wrap_bins() {
 					bin='$(dirname "$0")/'"${out##*/}"'.bin'
 				fi
 
-				echo '#!/bin/sh' > "$out"
 				case "${cmd##*/}" in
 					*-*cc|*-*cc-*|*-*++|*-*++-*|*-cpp)
-						echo -n 'exec "'"$bin"'" '"$CFLAGS"' '         >> "$out"
-						echo -n '${STAGING_DIR:+-idirafter '           >> "$out"
-						echo -n '"$STAGING_DIR/usr/include" '          >> "$out"
-						echo -n '-L "$STAGING_DIR/usr/lib" '           >> "$out"
-						echo -n '-Wl,-rpath-link,'                     >> "$out"
-						echo    '"$STAGING_DIR/usr/lib"} "$@"'         >> "$out"
+						wrap_bin_cc "$out" "$bin"
 					;;
 					*-ld)
-						echo -n 'exec "'"$bin"'" ${STAGING_DIR:+'      >> "$out"
-						echo -n '-L "$STAGING_DIR/usr/lib" '           >> "$out"
-						echo -n '-rpath-link '                         >> "$out"
-						echo    '"$STAGING_DIR/usr/lib"} "$@"'         >> "$out"
+						wrap_bin_ld "$out" "$bin"
 					;;
 					*)
-						echo    'exec "'"$bin"'" "$@"'                 >> "$out"
+						wrap_bin_other "$out" "$bin"
 					;;
 				esac
-				chmod +x "$out"
 			fi
 		done
 
@@ -325,6 +356,10 @@ print_config() {
 	echo "CONFIG_TOOLCHAIN_PREFIX=\"$prefix\"" >> "$config"
 	echo "CONFIG_TARGET_NAME=\"$target\"" >> "$config"
 
+	if [ "$LIBC_TYPE" != glibc ]; then
+		echo "CONFIG_TOOLCHAIN_LIBC=\"$LIBC_TYPE\"" >> "$config"
+	fi
+
 	local lib
 	for lib in C RT PTHREAD GCC STDCPP SSP GFORTRAN; do
 		local file