scummvm random work
[patches.git] / busybox-elf2flt.patch
1 Index: Makefile
2 ===================================================================
3 --- Makefile (revision 18843)
4 +++ Makefile (working copy)
5 @@ -676,9 +676,14 @@ busybox_unstripped: $(busybox-all) FORCE
6 $(call if_changed_rule,busybox__)
7 $(Q)rm -f .old_version
8
9 +LDFLAGS_ELF2FLT = -Wl,-elf2flt
10 busybox: busybox_unstripped
11 +ifneq (,$(findstring $(LDFLAGS_ELF2FLT),$(LDFLAGS)))
12 + $(Q)cp $< $@
13 +else
14 $(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
15 busybox_unstripped -o $@
16 +endif
17
18 # The actual objects are generated when descending,
19 # make sure no implicit rule kicks in
20 Index: Makefile.custom
21 ===================================================================
22 --- Makefile.custom (revision 18843)
23 +++ Makefile.custom (working copy)
24 @@ -2,9 +2,6 @@
25 # Build system
26 # ==========================================================================
27
28 -%.bflt: %_unstripped
29 - $(CROSS_COMPILE)elf2flt $(ELF2FLTFLAGS) $< -o $@
30 -
31 busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h $(srctree)/include/applets.h
32 $(Q)-$(SHELL) $^ >$@
33