Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

trylink: trivial fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2007-10-09 10:15:41 +00:00
parent e9fd69c8e8
commit 8d755adc1a
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/trylink
View File

@ -9,7 +9,6 @@ try() {
$debug && echo "Trying: $*" $debug && echo "Trying: $*"
"$@" >>$EXE.out 2>&1 "$@" >>$EXE.out 2>&1
exitcode=$? exitcode=$?
cat $EXE.out
return $exitcode return $exitcode
} }
@ -33,7 +32,6 @@ try $CC $LDFLAGS \
-Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
-Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \ -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
$l_list \ $l_list \
>/dev/null \
|| { || {
echo "Failed: $* $l_list" echo "Failed: $* $l_list"
cat $EXE.out cat $EXE.out
@ -76,7 +74,7 @@ done
# Make the binary with final, minimal list of libs # Make the binary with final, minimal list of libs
echo "Final link with: $LDLIBS" echo "Final link with: $LDLIBS"
l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'` l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose" test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
# --verbose gives us gobs of info to stdout (e.g. linker script used) # --verbose gives us gobs of info to stdout (e.g. linker script used)
if ! test -f busybox_ldscript; then if ! test -f busybox_ldscript; then
try $CC $LDFLAGS \ try $CC $LDFLAGS \
@ -121,7 +119,6 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
$l_list -Wl,--verbose \ $l_list -Wl,--verbose \
-Wl,-soname="libbusybox.so.$BB_VER" \ -Wl,-soname="libbusybox.so.$BB_VER" \
-Wl,-z,combreloc \ -Wl,-z,combreloc \
>/dev/null \
|| { || {
echo "Linking $EXE failed" echo "Linking $EXE failed"
cat $EXE.out cat $EXE.out
@ -140,7 +137,6 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
-Wl,--start-group $O_FILES -Wl,--end-group \ -Wl,--start-group $O_FILES -Wl,--end-group \
-Wl,--verbose \ -Wl,--verbose \
-L"$sharedlib_dir" -lbusybox \ -L"$sharedlib_dir" -lbusybox \
>/dev/null \
|| { || {
echo "Linking $EXE failed" echo "Linking $EXE failed"
cat $EXE.out cat $EXE.out
@ -176,10 +172,9 @@ int main(int argc, char **argv)
-o $EXE \ -o $EXE \
-Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
-L"$sharedlib_dir" -lbusybox \ -L"$sharedlib_dir" -lbusybox \
>/dev/null \
|| { || {
echo "Linking $EXE failed" echo "Linking $EXE failed"
cat -- $EXE.out cat $EXE.out
exit 1 exit 1
} }
rm -- "$sharedlib_dir/applet.c" $EXE.out rm -- "$sharedlib_dir/applet.c" $EXE.out
@ -190,4 +185,5 @@ fi
# libbusybox.so is needed only for -lbusybox at link time, # libbusybox.so is needed only for -lbusybox at link time,
# it is not needed at runtime. Deleting to reduce confusion. # it is not needed at runtime. Deleting to reduce confusion.
rm "$sharedlib_dir"/libbusybox.so >/dev/null rm "$sharedlib_dir"/libbusybox.so 2>/dev/null
exit 0 # or else we may confuse make