From 401de648a797c5931df1ade02c26270c82c3a345 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Fri, 6 Jun 2008 16:11:12 +0000
Subject: Build system: track -Wl,-elf2flt in CFLAGS_busybox too. Document in
 comments that it generally should be thers, not in LDFLAGS

---
 Makefile.flags | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Makefile.flags')

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
 
-- 
cgit v1.2.3