qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:30:16 +02:00
Code

[scripts] ext-toolchain.sh: rework generated gcc wrapper

Browse Source 
Only append -L and -Wl,-rpath-link flags if the command line contains -l, -L, -shared or -static flags;
this is needed to suppress "-rpath-link: linker input file unused because linking not done" on each cc invocation.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29946 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-01-29 18:53:12 +00:00
parent e23aeca7d2
commit 5a89e8c08e
1 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
scripts/ext-toolchain.sh
View File

@ -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"'" '"$CFLAGS"' ${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() { wrap_bins() {
if probe_cc; then if probe_cc; then
mkdir -p "$1" || return 1 mkdir -p "$1" || return 1
@ -212,27 +253,17 @@ wrap_bins() {
bin='$(dirname "$0")/'"${out##*/}"'.bin' bin='$(dirname "$0")/'"${out##*/}"'.bin'
fi fi
echo '#!/bin/sh' > "$out"
case "${cmd##*/}" in case "${cmd##*/}" in
*-*cc|*-*cc-*|*-*++|*-*++-*|*-cpp) *-*cc|*-*cc-*|*-*++|*-*++-*|*-cpp)
echo -n 'exec "'"$bin"'" '"$CFLAGS"' ' >> "$out" wrap_bin_cc "$out" "$bin"
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"
;; ;;
*-ld) *-ld)
echo -n 'exec "'"$bin"'" ${STAGING_DIR:+' >> "$out" wrap_bin_ld "$out" "$bin"
echo -n '-L "$STAGING_DIR/usr/lib" ' >> "$out"
echo -n '-rpath-link ' >> "$out"
echo '"$STAGING_DIR/usr/lib"} "$@"' >> "$out"
;; ;;
*) *)
echo 'exec "'"$bin"'" "$@"' >> "$out" wrap_bin_other "$out" "$bin"
;; ;;
esac esac
chmod +x "$out"
fi fi
done done