aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2015-04-14 14:15:15 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2015-04-14 14:15:15 +0200
commite0ddb65cb234db6482d80febee1a63778f818db6 (patch)
treee2057d908f6fe6b73ce0469fb3df6ee188e9d5ef
parent7b729edd33aea5361e0740df800a1a0a1ff70f7f (diff)
downloadbusybox-w32-e0ddb65cb234db6482d80febee1a63778f818db6.tar.gz
busybox-w32-e0ddb65cb234db6482d80febee1a63778f818db6.tar.bz2
busybox-w32-e0ddb65cb234db6482d80febee1a63778f818db6.zip
build system: make CONFIG_EXTRA_LDFLAGS go to LDFLAGS, not EXTRA_LDFLAGS
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--Makefile.flags2
-rwxr-xr-xexamples/android-build2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.flags b/Makefile.flags
index 307afa7f5..a1ed1480a 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -163,7 +163,7 @@ SKIP_STRIP = y
163endif 163endif
164 164
165ifneq ($(CONFIG_EXTRA_LDFLAGS),) 165ifneq ($(CONFIG_EXTRA_LDFLAGS),)
166EXTRA_LDFLAGS += $(strip $(subst ",,$(CONFIG_EXTRA_LDFLAGS))) 166LDFLAGS += $(strip $(subst ",,$(CONFIG_EXTRA_LDFLAGS)))
167#")) 167#"))
168endif 168endif
169 169
diff --git a/examples/android-build b/examples/android-build
index 89f3b637a..123ba966e 100755
--- a/examples/android-build
+++ b/examples/android-build
@@ -29,4 +29,6 @@ else
29 LDLIBS="dl m c gcc" 29 LDLIBS="dl m c gcc"
30fi 30fi
31 31
32# It's possible with newer version
33# you need to use CFLAGS_busybox instead of EXTRA_LDFLAGS below:
32make EXTRA_LDFLAGS="$LDFLAGS" LDLIBS="$LDLIBS" "$@" 34make EXTRA_LDFLAGS="$LDFLAGS" LDLIBS="$LDLIBS" "$@"