aboutsummaryrefslogtreecommitdiff
path: root/Makefile.flags
diff options
context:
space:
mode:
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