aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-04-21 01:18:07 +0000
committerMike Frysinger <vapier@gentoo.org>2006-04-21 01:18:07 +0000
commit586ea61284a6ef90d4274b10f2e36e67e62973df (patch)
treea912b58e4697dabf3f3335cd35b3f5011c1fb500
parent791976490b7c8838ccd847e30e9348c2c72b5e88 (diff)
downloadbusybox-w32-586ea61284a6ef90d4274b10f2e36e67e62973df.tar.gz
busybox-w32-586ea61284a6ef90d4274b10f2e36e67e62973df.tar.bz2
busybox-w32-586ea61284a6ef90d4274b10f2e36e67e62973df.zip
2006-04-20 Shaun Jackman <sjackman@gmail.com>
* Makefile: Build a bFLT binary. * Rules.mak: Ditto.
-rw-r--r--Makefile3
-rw-r--r--Rules.mak7
2 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 29e741ddd..977df5d4e 100644
--- a/Makefile
+++ b/Makefile
@@ -305,6 +305,9 @@ busybox: busybox_unstripped
305 $(Q)cp busybox_unstripped busybox 305 $(Q)cp busybox_unstripped busybox
306 $(do_strip) 306 $(do_strip)
307 307
308%.bflt: %_unstripped
309 $(do_elf2flt)
310
308busybox.links: $(top_srcdir)/applets/busybox.mkll include/bb_config.h $(top_srcdir)/include/applets.h 311busybox.links: $(top_srcdir)/applets/busybox.mkll include/bb_config.h $(top_srcdir)/include/applets.h
309 $(Q)-$(SHELL) $^ >$@ 312 $(Q)-$(SHELL) $^ >$@
310 313
diff --git a/Rules.mak b/Rules.mak
index d0039b082..36cda55af 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -38,6 +38,7 @@ AS = $(CROSS)as
38LD = $(CROSS)ld 38LD = $(CROSS)ld
39NM = $(CROSS)nm 39NM = $(CROSS)nm
40STRIP = $(CROSS)strip 40STRIP = $(CROSS)strip
41ELF2FLT = $(CROSS)elf2flt
41CPP = $(CC) -E 42CPP = $(CC) -E
42SED ?= sed 43SED ?= sed
43 44
@@ -291,16 +292,19 @@ pur_disp_compile.h = echo " "HOSTCC $(show_objs)
291pur_disp_strip = echo " "STRIP $(show_objs) 292pur_disp_strip = echo " "STRIP $(show_objs)
292pur_disp_link = echo " "LINK $(show_objs) 293pur_disp_link = echo " "LINK $(show_objs)
293pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs) 294pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs)
295pur_disp_elf2flt = echo " "ELF2FLT $(ELF2FLTFLAGS) $(show_objs)
294sil_disp_compile.c = true 296sil_disp_compile.c = true
295sil_disp_compile.h = true 297sil_disp_compile.h = true
296sil_disp_strip = true 298sil_disp_strip = true
297sil_disp_link = true 299sil_disp_link = true
298sil_disp_ar = true 300sil_disp_ar = true
301sil_disp_elf2flt = true
299ver_disp_compile.c = echo $(cmd_compile.c) 302ver_disp_compile.c = echo $(cmd_compile.c)
300ver_disp_compile.h = echo $(cmd_compile.h) 303ver_disp_compile.h = echo $(cmd_compile.h)
301ver_disp_strip = echo $(cmd_strip) 304ver_disp_strip = echo $(cmd_strip)
302ver_disp_link = echo $(cmd_link) 305ver_disp_link = echo $(cmd_link)
303ver_disp_ar = echo $(cmd_ar) 306ver_disp_ar = echo $(cmd_ar)
307ver_disp_elf2flt = echo $(cmd_elf2flt)
304disp_compile.c = $($(DISP)_disp_compile.c) 308disp_compile.c = $($(DISP)_disp_compile.c)
305disp_compile.h = $($(DISP)_disp_compile.h) 309disp_compile.h = $($(DISP)_disp_compile.h)
306disp_strip = $($(DISP)_disp_strip) 310disp_strip = $($(DISP)_disp_strip)
@@ -308,15 +312,18 @@ disp_link = $($(DISP)_disp_link)
308disp_ar = $($(DISP)_disp_ar) 312disp_ar = $($(DISP)_disp_ar)
309disp_gen = $(SECHO) " "GEN $@ ; true 313disp_gen = $(SECHO) " "GEN $@ ; true
310disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true 314disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true
315disp_elf2flt = $($(DISP)_disp_elf2flt)
311cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< 316cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
312cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< 317cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
313cmd_strip = $(STRIPCMD) $@ 318cmd_strip = $(STRIPCMD) $@
314cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) 319cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS)
315cmd_ar = $(AR) $(ARFLAGS) $@ $^ 320cmd_ar = $(AR) $(ARFLAGS) $@ $^
321cmd_elf2flt = $(ELF2FLT) $(ELF2FLTFLAGS) $< -o $@
316compile.c = @$(disp_compile.c) ; $(cmd_compile.c) 322compile.c = @$(disp_compile.c) ; $(cmd_compile.c)
317compile.h = @$(disp_compile.h) ; $(cmd_compile.h) 323compile.h = @$(disp_compile.h) ; $(cmd_compile.h)
318do_strip = @$(disp_strip) ; $(cmd_strip) 324do_strip = @$(disp_strip) ; $(cmd_strip)
319do_link = @$(disp_link) ; $(cmd_link) 325do_link = @$(disp_link) ; $(cmd_link)
320do_ar = @$(disp_ar) ; $(cmd_ar) 326do_ar = @$(disp_ar) ; $(cmd_ar)
327do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt)
321 328
322.PHONY: dummy 329.PHONY: dummy