aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.build3
-rwxr-xr-xscripts/gen_build_files.sh2
-rwxr-xr-xscripts/trylink4
3 files changed, 6 insertions, 3 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 5685b5bcc..5eac45f91 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -255,8 +255,9 @@ $(sort $(subdir-obj-y)): $(subdir-ym) ;
255ifdef builtin-target 255ifdef builtin-target
256quiet_cmd_link_o_target = LD $@ 256quiet_cmd_link_o_target = LD $@
257# If the list of objects to link is empty, just create an empty built-in.o 257# If the list of objects to link is empty, just create an empty built-in.o
258# -nostdlib is added to make "make LD=gcc ..." work (some people use that)
258cmd_link_o_target = $(if $(strip $(obj-y)),\ 259cmd_link_o_target = $(if $(strip $(obj-y)),\
259 $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\ 260 $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
260 rm -f $@; $(AR) rcs $@) 261 rm -f $@; $(AR) rcs $@)
261 262
262$(builtin-target): $(obj-y) FORCE 263$(builtin-target): $(obj-y) FORCE
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index e8fa831be..ebee17c64 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -71,7 +71,7 @@ sed -n -e 's@^//usage:\([ '"$TAB"'].*\)$@\1 \\@p' \
71 71
72# (Re)generate */Kbuild and */Config.in 72# (Re)generate */Kbuild and */Config.in
73# We skip .dotdirs - makes git/svn/etc users happier 73# We skip .dotdirs - makes git/svn/etc users happier
74{ cd -- "$srctree" && find . -type d -not '(' -name '.?*' -prune ')'; } \ 74{ cd -- "$srctree" && find . -type d ! '(' -name '.?*' -prune ')'; } \
75| while read -r d; do 75| while read -r d; do
76 d="${d#./}" 76 d="${d#./}"
77 77
diff --git a/scripts/trylink b/scripts/trylink
index e47169917..5da494fbb 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -268,7 +268,7 @@ fi
268 268
269if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then 269if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
270 echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)" 270 echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)"
271 gcc -DNAME_MAIN_CNAME -E -include include/autoconf.h include/applets.h \ 271 gcc -DNAME_MAIN -E -include include/autoconf.h include/applets.h \
272 | grep -v "^#" \ 272 | grep -v "^#" \
273 | grep -v "^$" \ 273 | grep -v "^$" \
274 > applet_lst.tmp 274 > applet_lst.tmp
@@ -300,6 +300,8 @@ int main(int argc, char **argv)
300 } 300 }
301 rm -- "$sharedlib_dir/applet.c" $EXE.out 301 rm -- "$sharedlib_dir/applet.c" $EXE.out
302 $STRIP -s --remove-section=.note --remove-section=.comment $EXE 302 $STRIP -s --remove-section=.note --remove-section=.comment $EXE
303 # Let user see that we do something - list the names of created binaries:
304 echo "$EXE"
303 305
304 done <applet_lst.tmp 306 done <applet_lst.tmp
305fi 307fi