Merge branch 'busybox' into merge

Conflicts:
	debianutils/which.c
	editors/vi.c
	libbb/executable.c

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) ;
 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
+# -nostdlib is added to make "make LD=gcc ..." work (some people use that)
 cmd_link_o_target = $(if $(strip $(obj-y)),\
-                $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
+                $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
                 rm -f $@; $(AR) rcs $@)
 
 $(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' \
 
 # (Re)generate */Kbuild and */Config.in
 # We skip .dotdirs - makes git/svn/etc users happier
-{ cd -- "$srctree" && find . -type d -not '(' -name '.?*' -prune ')'; } \
+{ cd -- "$srctree" && find . -type d ! '(' -name '.?*' -prune ')'; } \
 | while read -r d; do
         d="${d#./}"
 
diff --git a/scripts/trylink b/scripts/trylink
index e47169917..5da494fbb 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -268,7 +268,7 @@ fi
 
 if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
     echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)"
-    gcc -DNAME_MAIN_CNAME -E -include include/autoconf.h include/applets.h \
+    gcc -DNAME_MAIN -E -include include/autoconf.h include/applets.h \
     | grep -v "^#" \
     | grep -v "^$" \
     > applet_lst.tmp
@@ -300,6 +300,8 @@ int main(int argc, char **argv)
         }
         rm -- "$sharedlib_dir/applet.c" $EXE.out
         $STRIP -s --remove-section=.note --remove-section=.comment $EXE
+        # Let user see that we do something - list the names of created binaries:
+        echo "$EXE"
 
     done <applet_lst.tmp
 fi