aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-06-04 11:28:24 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-06-04 11:28:24 +0000
commit1da86d2f40f304d78b2ae4aac3b590b19adc7ce3 (patch)
tree6f2a87934ad24c0e640c6313d56d2e28d1e81185 /scripts
parent1e93f3c5859aeebcca7c0480de2bd038defe8b1c (diff)
downloadbusybox-1da86d2f40f304d78b2ae4aac3b590b19adc7ce3.tar.gz
build system: add PIE build option
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
OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
-CFLAGS := $(CFLAGS)
-CPPFLAGS+= -D"KBUILD_STR(s)=\#s" #-Q
+CFLAGS := $(CFLAGS)
+CPPFLAGS += -D"KBUILD_STR(s)=\#s" #-Q
# We need some generic definitions
include $(srctree)/scripts/Kbuild.include
@@ -180,7 +180,7 @@ busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/autoconf.h
busybox: busybox_unstripped.o
$(srctree)/scripts/trylink \
busybox_unstripped \
- "$(CC)" \
+ "$(CC) $(CFLAGS_busybox)" \
"$(CFLAGS)" \
"$(LDFLAGS)" \
"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
quiet_cmd_link_o_target = LD $@
# If the list of objects to link is empty, just create an empty built-in.o
cmd_link_o_target = $(if $(strip $(obj-y)),\
- $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
- rm -f $@; $(AR) rcs $@)
+ $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
+ rm -f $@; $(AR) rcs $@)
$(builtin-target): $(obj-y) FORCE
$(call if_changed,link_o_target)