diff options
| author | Denis Vlasenko | 2008-04-30 00:15:56 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-04-30 00:15:56 +0000 |
| commit | a2dcb5017503acea97547e4c538a47f920d752f7 (patch) | |
| tree | 342a0ad0a1a8420e7d640eb31a91357d05a8d63b /scripts | |
| parent | 3c07e4b8776da6f23251f98e95207f4c713d73bd (diff) | |
| download | busybox-a2dcb5017503acea97547e4c538a47f920d752f7.zip busybox-a2dcb5017503acea97547e4c538a47f920d752f7.tar.gz | |
trylink: fix glibc check; make --sort-section option look less ugly
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/trylink | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/trylink b/scripts/trylink index 89e36b7..9efd208 100755 --- a/scripts/trylink +++ b/scripts/trylink @@ -66,7 +66,7 @@ check_libc_is_glibc() { #if defined(__GLIBC__) && !defined(__UCLIBC__) syntax error here #endif - " >"$tempname" + " >"$tempname".c if $CC "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then echo "$2"; else @@ -83,15 +83,15 @@ O_FILES="$5" A_FILES="$6" LDLIBS="$7" -# The -Wl,--sort-section option is not supported by older versions of ld -SORT_SECTION=`check_cc "-Wl,--sort-section -Wl,alignment" ""` +# The --sort-section option is not supported by older versions of ld +SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""` # Static linking against glibc produces buggy executables # (glibc does not cope well with ld --gc-sections). # See sources.redhat.com/bugzilla/show_bug.cgi?id=3400 # Note that glibc is unsuitable for static linking anyway. # We are removing -Wl,--gc-sections from link command line. -GC_SECTION=`( +GC_SECTIONS=`( . ./.config if test x"$CONFIG_STATIC" = x"y"; then check_libc_is_glibc "" "-Wl,--gc-sections" @@ -112,7 +112,7 @@ try $CC $CFLAGS $LDFLAGS \ -o $EXE \ -Wl,--sort-common \ $SORT_SECTION \ - $GC_SECTION \ + $GC_SECTIONS \ -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \ $l_list \ || { @@ -136,7 +136,7 @@ while test "$LDLIBS"; do -o $EXE \ -Wl,--sort-common \ $SORT_SECTION \ - $GC_SECTION \ + $GC_SECTIONS \ -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \ $l_list if test $? = 0; then @@ -165,7 +165,7 @@ if ! test -f busybox_ldscript; then -o $EXE \ -Wl,--sort-common \ $SORT_SECTION \ - $GC_SECTION \ + $GC_SECTIONS \ -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \ $l_list \ -Wl,--warn-common \ @@ -187,7 +187,7 @@ else -o $EXE \ -Wl,--sort-common \ $SORT_SECTION \ - $GC_SECTION \ + $GC_SECTIONS \ -Wl,-T -Wl,busybox_ldscript \ -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \ $l_list \ @@ -243,7 +243,7 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then -o $EXE \ -Wl,--sort-common \ $SORT_SECTION \ - $GC_SECTION \ + $GC_SECTIONS \ -Wl,--start-group $O_FILES -Wl,--end-group \ -L"$sharedlib_dir" -lbusybox \ -Wl,--warn-common \ @@ -282,7 +282,7 @@ int main(int argc, char **argv) -o $EXE \ -Wl,--sort-common \ $SORT_SECTION \ - $GC_SECTION \ + $GC_SECTIONS \ -L"$sharedlib_dir" -lbusybox \ -Wl,--warn-common \ || { |