the -elf2flt flag can be used w/out -Wl, so drop the requirement so people can use either form
This commit is contained in:
parent
98c87f7575
commit
dec37b3232
@ -105,12 +105,12 @@ ifeq ($(CONFIG_DMALLOC),y)
|
|||||||
LDLIBS += dmalloc
|
LDLIBS += dmalloc
|
||||||
endif
|
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.
|
# env var should be set for make invocation.
|
||||||
# Here we check whether CFLAGS_busybox indeed contains that flag.
|
# Here we check whether CFLAGS_busybox indeed contains that flag.
|
||||||
# (For historical reasons, we also check LDFLAGS, which doesn't
|
# (For historical reasons, we also check LDFLAGS, which doesn't
|
||||||
# seem to be entirely correct variable to put "-Wl,-elf2flt" into).
|
# seem to be entirely correct variable to put "-elf2flt" into).
|
||||||
W_ELF2FLT = -Wl,-elf2flt
|
W_ELF2FLT = -elf2flt
|
||||||
ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox)))
|
ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox)))
|
||||||
SKIP_STRIP = y
|
SKIP_STRIP = y
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user