diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-03-12 07:56:49 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-03-12 07:56:49 +0000 |
| commit | dec37b3232d3dce3fb3ad024845f46d882558777 (patch) | |
| tree | 58af370a6e8c0c5056fdfc465b42737621f40aa0 | |
| parent | 98c87f75755c1b53c8bd84f487e4bc7cba359b3e (diff) | |
| download | busybox-w32-dec37b3232d3dce3fb3ad024845f46d882558777.tar.gz busybox-w32-dec37b3232d3dce3fb3ad024845f46d882558777.tar.bz2 busybox-w32-dec37b3232d3dce3fb3ad024845f46d882558777.zip | |
the -elf2flt flag can be used w/out -Wl, so drop the requirement so people can use either form
| -rw-r--r-- | Makefile.flags | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.flags b/Makefile.flags index 4c24ad690..2109fdf11 100644 --- a/Makefile.flags +++ b/Makefile.flags | |||
| @@ -105,12 +105,12 @@ ifeq ($(CONFIG_DMALLOC),y) | |||
| 105 | LDLIBS += dmalloc | 105 | LDLIBS += dmalloc |
| 106 | endif | 106 | endif |
| 107 | 107 | ||
| 108 | # If a flat binary should be built, CFLAGS_busybox="-Wl,-elf2flt" | 108 | # If a flat binary should be built, CFLAGS_busybox="-elf2flt" |
| 109 | # env var should be set for make invocation. | 109 | # env var should be set for make invocation. |
| 110 | # Here we check whether CFLAGS_busybox indeed contains that flag. | 110 | # Here we check whether CFLAGS_busybox indeed contains that flag. |
| 111 | # (For historical reasons, we also check LDFLAGS, which doesn't | 111 | # (For historical reasons, we also check LDFLAGS, which doesn't |
| 112 | # seem to be entirely correct variable to put "-Wl,-elf2flt" into). | 112 | # seem to be entirely correct variable to put "-elf2flt" into). |
| 113 | W_ELF2FLT = -Wl,-elf2flt | 113 | W_ELF2FLT = -elf2flt |
| 114 | ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox))) | 114 | ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox))) |
| 115 | SKIP_STRIP = y | 115 | SKIP_STRIP = y |
| 116 | endif | 116 | endif |