summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger2009-03-12 07:56:49 +0000
committerMike Frysinger2009-03-12 07:56:49 +0000
commitdec37b3232d3dce3fb3ad024845f46d882558777 (patch)
tree58af370a6e8c0c5056fdfc465b42737621f40aa0
parent98c87f75755c1b53c8bd84f487e4bc7cba359b3e (diff)
downloadbusybox-dec37b3232d3dce3fb3ad024845f46d882558777.zip
busybox-dec37b3232d3dce3fb3ad024845f46d882558777.tar.gz
the -elf2flt flag can be used w/out -Wl, so drop the requirement so people can use either form
-rw-r--r--Makefile.flags6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.flags b/Makefile.flags
index 4c24ad6..2109fdf 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -105,12 +105,12 @@ ifeq ($(CONFIG_DMALLOC),y)
LDLIBS += dmalloc
endif
-# If a flat binary should be built, CFLAGS_busybox="-Wl,-elf2flt"
+# If a flat binary should be built, CFLAGS_busybox="-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
+# seem to be entirely correct variable to put "-elf2flt" into).
+W_ELF2FLT = -elf2flt
ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox)))
SKIP_STRIP = y
endif