randomconfig fixes

[oweals/busybox.git] / scripts / trylink

diff --git a/scripts/trylink b/scripts/trylink
index 9efd208aeec4e5fe88183d825ce63f177f9ab672..8c8854679be80d0294ebb3e807c3a446a1fa8933 100755 (executable)
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -41,9 +41,8 @@ try() {
     printf "%s\n" "$*" >>$EXE.out
     printf "%s\n" "==========" >>$EXE.out
     $debug && echo "Trying: $*"
-    "$@" >>$EXE.out 2>&1
-    exitcode=$?
-    return $exitcode
+    $@ >>$EXE.out 2>&1
+    return $?
 }
 
 check_cc() {
@@ -100,6 +99,11 @@ else
 fi
 )`
 
+# The --gc-sections option is not supported by older versions of ld
+if test -n "$GC_SECTIONS"; then
+    GC_SECTIONS=`check_cc "$GC_SECTIONS" ""`
+fi
+
 # Sanitize lib list (dups, extra spaces etc)
 LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs`
 
@@ -126,11 +130,12 @@ try $CC $CFLAGS $LDFLAGS \
 while test "$LDLIBS"; do
     $debug && echo "Trying libraries: $LDLIBS"
     all_needed=true
+    last_needed=false
     for one in $LDLIBS; do
        without_one=`echo " $LDLIBS " | sed "s/ $one / /g" | xargs`
        # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
        l_list=`echo "$without_one" | 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"
+       test x"$l_list" != x"" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
        $debug && echo "Trying -l options: '$l_list'"
        try $CC $CFLAGS $LDFLAGS \
                -o $EXE \
@@ -140,19 +145,22 @@ while test "$LDLIBS"; do
                -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
                $l_list
        if test $? = 0; then
-           echo " Library $one is not needed"
+           echo " Library $one is not needed, excluding it"
            LDLIBS="$without_one"
            all_needed=false
+           last_needed=false
        else
-           echo " Library $one is needed"
+           echo " Library $one is needed, can't exclude it (yet)"
+           last_needed=true
        fi
     done
     # All libs were needed, can't remove any
     $all_needed && break
-    # 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 "$LDLIBS" | grep -q ' '; } || break
+    # Optimization: was the last tried lib needed?
+    if $last_needed; then
+       # Was it the only one lib left? Don't test again then.
+       { echo "$LDLIBS" | grep -q ' '; } || break
+    fi
 done
 
 # Make the binary with final, minimal list of libs
@@ -169,7 +177,7 @@ if ! test -f busybox_ldscript; then
            -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
            $l_list \
            -Wl,--warn-common \
-           -Wl,-Map -Wl,$EXE.map \
+           -Wl,-Map,$EXE.map \
            -Wl,--verbose \
     || {
        cat $EXE.out
@@ -188,11 +196,11 @@ else
            -Wl,--sort-common \
            $SORT_SECTION \
            $GC_SECTIONS \
-           -Wl,-T -Wl,busybox_ldscript \
+           -Wl,-T,busybox_ldscript \
            -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
            $l_list \
            -Wl,--warn-common \
-           -Wl,-Map -Wl,$EXE.map \
+           -Wl,-Map,$EXE.map \
            -Wl,--verbose \
     || {
        cat $EXE.out
@@ -225,7 +233,7 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
            -Wl,--start-group $A_FILES -Wl,--end-group \
            $l_list \
            -Wl,--warn-common \
-           -Wl,-Map -Wl,$EXE.map \
+           -Wl,-Map,$EXE.map \
            -Wl,--verbose \
     || {
        echo "Linking $EXE failed"
@@ -247,7 +255,7 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
            -Wl,--start-group $O_FILES -Wl,--end-group \
            -L"$sharedlib_dir" -lbusybox \
            -Wl,--warn-common \
-           -Wl,-Map -Wl,$EXE.map \
+           -Wl,-Map,$EXE.map \
            -Wl,--verbose \
     || {
        echo "Linking $EXE failed"