aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-06 03:41:08 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-06 03:41:08 +0000
commit8274e06677ba55532a4e1488b659f0b1e743130e (patch)
treeaf0a5bec322c6f2dc3214ea6a57997455cc35876 /scripts
parente013475830b2399e31f5e17758dd6674b6b60058 (diff)
downloadbusybox-8274e06677ba55532a4e1488b659f0b1e743130e.tar.gz
busybox-8274e06677ba55532a4e1488b659f0b1e743130e.tar.bz2
sed: fix 'q' command handling ("Nguyen Thai Ngoc Duy" <pclouds@gmail.com>)
add testsuite entry for it. Fix applet order checker. Fix cmp yelling. trylink: fix error file and map file generation applets: fix applet order
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/trylink13
1 files changed, 8 insertions, 5 deletions
diff --git a/scripts/trylink b/scripts/trylink
index bfc67bf5d..b8bf8b1c7 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -25,8 +25,9 @@ try "-Wl,--start-group $l_list -Wl,--end-group" "$@" \
# Hack: we are not supposed to know executable name,
# but this hack cuts down link time
mv busybox_unstripped busybox_unstripped.tmp
+mv busybox.map busybox.map.tmp
-# Now try to remove each lib and build without.
+# Now try to remove each lib and build without it.
# Stop when no lib can be removed.
ever_discarded=false
while test "$BBOX_LIB_LIST"; do
@@ -47,17 +48,19 @@ while test "$BBOX_LIB_LIST"; do
done
# All libs were needed, can't remove any
$all_needed && break
- # If there is no space, the list has just one lib.
+ # If there is no space char, the list has just one lib.
# I'm not sure that in this case lib really is 100% needed.
# Let's try linking without it anyway... thus commented out.
- #echo "$BBOX_LIB_LIST" | grep -q ' ' || break
+ #{ echo "$BBOX_LIB_LIST" | grep -q ' '; } || break
done
mv busybox_unstripped.tmp busybox_unstripped
+mv busybox.map.tmp busybox.map
$ever_discarded && {
- # Ok, make the binary
+ # Make the binary with final, minimal list of libs
echo "Final link with: $BBOX_LIB_LIST"
l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/'`
- try "-Wl,--start-group $l_list -Wl,--end-group" "$@"
+ try "-Wl,--start-group $l_list -Wl,--end-group" "$@" && exit 1
}
+rm busybox_ld.err
exit 0 # Ensure "success" exit code