aboutsummaryrefslogtreecommitdiff
path: root/Makefile.flags
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-06-06 16:11:12 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-06-06 16:11:12 +0000
commit401de648a797c5931df1ade02c26270c82c3a345 (patch)
tree44741c8de0a3fc2dfda08f24f199917f8a905719 /Makefile.flags
parent7bdf0c82da3713ec2a0f0090ba663c1167d10a67 (diff)
downloadbusybox-401de648a797c5931df1ade02c26270c82c3a345.tar.gz
busybox-401de648a797c5931df1ade02c26270c82c3a345.tar.bz2
Build system: track -Wl,-elf2flt in CFLAGS_busybox too.
Document in comments that it generally should be thers, not in LDFLAGS
Diffstat (limited to 'Makefile.flags')
-rw-r--r--Makefile.flags9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.flags b/Makefile.flags
index cb2c8780a..e9405476b 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -91,8 +91,13 @@ ifeq ($(CONFIG_DMALLOC),y)
LDLIBS += dmalloc
endif
-LDFLAGS_ELF2FLT = -Wl,-elf2flt
-ifneq (,$(findstring $(LDFLAGS_ELF2FLT),$(LDFLAGS)))
+# If a flat binary should be built, CFLAGS_busybox="-Wl,-elf2flt"
+# env var should be set for make invocation.
+# Here we check whether CFLAGS_busybox indeed contains that flag.
+# (For historical reasons, we also check LDFLAGS, which doesn't
+# seem to be entirely correct variable to put "-Wl,-elf2flt" into).
+W_ELF2FLT = -Wl,-elf2flt
+ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox)))
SKIP_STRIP = y
endif