aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.IMA6
-rw-r--r--scripts/Makefile.build4
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index 988c6a6d1..a34db50f4 100644
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -45,8 +45,8 @@ STRIP = $(CROSS_COMPILE)strip
45OBJCOPY = $(CROSS_COMPILE)objcopy 45OBJCOPY = $(CROSS_COMPILE)objcopy
46OBJDUMP = $(CROSS_COMPILE)objdump 46OBJDUMP = $(CROSS_COMPILE)objdump
47 47
48CFLAGS := $(CFLAGS) 48CFLAGS := $(CFLAGS)
49CPPFLAGS+= -D"KBUILD_STR(s)=\#s" #-Q 49CPPFLAGS += -D"KBUILD_STR(s)=\#s" #-Q
50 50
51# We need some generic definitions 51# We need some generic definitions
52include $(srctree)/scripts/Kbuild.include 52include $(srctree)/scripts/Kbuild.include
@@ -180,7 +180,7 @@ busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/autoconf.h
180busybox: busybox_unstripped.o 180busybox: busybox_unstripped.o
181 $(srctree)/scripts/trylink \ 181 $(srctree)/scripts/trylink \
182 busybox_unstripped \ 182 busybox_unstripped \
183 "$(CC)" \ 183 "$(CC) $(CFLAGS_busybox)" \
184 "$(CFLAGS)" \ 184 "$(CFLAGS)" \
185 "$(LDFLAGS)" \ 185 "$(LDFLAGS)" \
186 "busybox_unstripped.o" \ 186 "busybox_unstripped.o" \
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index ddefea5a6..f343818b1 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -251,8 +251,8 @@ ifdef builtin-target
251quiet_cmd_link_o_target = LD $@ 251quiet_cmd_link_o_target = LD $@
252# If the list of objects to link is empty, just create an empty built-in.o 252# If the list of objects to link is empty, just create an empty built-in.o
253cmd_link_o_target = $(if $(strip $(obj-y)),\ 253cmd_link_o_target = $(if $(strip $(obj-y)),\
254 $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\ 254 $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
255 rm -f $@; $(AR) rcs $@) 255 rm -f $@; $(AR) rcs $@)
256 256
257$(builtin-target): $(obj-y) FORCE 257$(builtin-target): $(obj-y) FORCE
258 $(call if_changed,link_o_target) 258 $(call if_changed,link_o_target)