emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build system: pass CFLAGS to link stage too (closes bug 1376)

Browse Source
This commit is contained in:
Denis Vlasenko 2008-02-14 12:24:14 +00:00
parent b2e578a1f2
commit f1d93ec420
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -571,6 +571,7 @@ quiet_cmd_busybox__ ?= LINK $@
cmd_busybox__ ?= $(srctree)/scripts/trylink \ cmd_busybox__ ?= $(srctree)/scripts/trylink \
"$@" \ "$@" \
"$(CC)" \ "$(CC)" \
"$(CFLAGS)" \
"$(LDFLAGS) $(EXTRA_LDFLAGS)" \ "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
"$(core-y)" \ "$(core-y)" \
"$(libs-y)" \ "$(libs-y)" \

23
scripts/trylink
View File

@ -77,10 +77,11 @@ check_libc_is_glibc() {
EXE="$1" EXE="$1"
CC="$2" CC="$2"
LDFLAGS="$3" CFLAGS="$3"
O_FILES="$4" LDFLAGS="$4"
A_FILES="$5" O_FILES="$5"
LDLIBS="$6" A_FILES="$6"
LDLIBS="$7"
# The -Wl,--sort-section option is not supported by older versions of ld # The -Wl,--sort-section option is not supported by older versions of ld
SORT_SECTION=`check_cc "-Wl,--sort-section -Wl,alignment" ""` SORT_SECTION=`check_cc "-Wl,--sort-section -Wl,alignment" ""`
@ -107,7 +108,7 @@ echo "Trying libraries: $LDLIBS"
# "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3" # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3"
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" test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
try $CC $LDFLAGS \ try $CC $CFLAGS $LDFLAGS \
-o $EXE \ -o $EXE \
-Wl,--sort-common \ -Wl,--sort-common \
$SORT_SECTION \ $SORT_SECTION \
@ -131,7 +132,7 @@ while test "$LDLIBS"; do
l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'` 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'" $debug && echo "Trying -l options: '$l_list'"
try $CC $LDFLAGS \ try $CC $CFLAGS $LDFLAGS \
-o $EXE \ -o $EXE \
-Wl,--sort-common \ -Wl,--sort-common \
$SORT_SECTION \ $SORT_SECTION \
@ -160,7 +161,7 @@ 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" 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 $CFLAGS $LDFLAGS \
-o $EXE \ -o $EXE \
-Wl,--sort-common \ -Wl,--sort-common \
$SORT_SECTION \ $SORT_SECTION \
@ -182,7 +183,7 @@ else
# *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*) # *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*)
# This will eliminate most of the padding (~3kb). # This will eliminate most of the padding (~3kb).
# Hmm, "ld --sort-section alignment" should do it too. # Hmm, "ld --sort-section alignment" should do it too.
try $CC $LDFLAGS \ try $CC $CFLAGS $LDFLAGS \
-o $EXE \ -o $EXE \
-Wl,--sort-common \ -Wl,--sort-common \
$SORT_SECTION \ $SORT_SECTION \
@ -212,7 +213,7 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
ln -s "libbusybox.so.$BB_VER" "$sharedlib_dir"/libbusybox.so 2>/dev/null ln -s "libbusybox.so.$BB_VER" "$sharedlib_dir"/libbusybox.so 2>/dev/null
EXE="$sharedlib_dir/libbusybox.so.${BB_VER}_unstripped" EXE="$sharedlib_dir/libbusybox.so.${BB_VER}_unstripped"
try $CC $LDFLAGS \ try $CC $CFLAGS $LDFLAGS \
-o $EXE \ -o $EXE \
-shared -fPIC \ -shared -fPIC \
-Wl,--enable-new-dtags \ -Wl,--enable-new-dtags \
@ -238,7 +239,7 @@ fi
if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
EXE="$sharedlib_dir/busybox_unstripped" EXE="$sharedlib_dir/busybox_unstripped"
try $CC $LDFLAGS \ try $CC $CFLAGS $LDFLAGS \
-o $EXE \ -o $EXE \
-Wl,--sort-common \ -Wl,--sort-common \
$SORT_SECTION \ $SORT_SECTION \
@ -277,7 +278,7 @@ int main(int argc, char **argv)
" >"$sharedlib_dir/applet.c" " >"$sharedlib_dir/applet.c"
EXE="$sharedlib_dir/$name" EXE="$sharedlib_dir/$name"
try $CC $LDFLAGS "$sharedlib_dir/applet.c" \ try $CC $CFLAGS $LDFLAGS "$sharedlib_dir/applet.c" \
-o $EXE \ -o $EXE \
-Wl,--sort-common \ -Wl,--sort-common \
$SORT_SECTION \ $SORT_SECTION \