[git commit master] build system: more fixes to parallel build

Denys Vlasenko vda.linux at googlemail.com
Tue Nov 24 23:22:31 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=18221506e5aeb9c279b73bc9418b60c75b10399a
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 Makefile       |    4 +++-
 applets/Kbuild |    3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7084c5c..3a49a69 100644
--- a/Makefile
+++ b/Makefile
@@ -359,8 +359,10 @@ scripts_basic:
 scripts/basic/%: scripts_basic ;
 
 # bbox: we have helpers in applets/
+# we depend on scripts_basic, since scripts/basic/fixdep
+# must be built before any other host prog
 PHONY += applets_dir
-applets_dir:
+applets_dir: scripts_basic
 	$(Q)$(MAKE) $(build)=applets
 
 applets/%: applets_dir ;
diff --git a/applets/Kbuild b/applets/Kbuild
index 88e9816..a6b0cf6 100644
--- a/applets/Kbuild
+++ b/applets/Kbuild
@@ -12,9 +12,6 @@ hostprogs-y += usage usage_pod applet_tables
 
 always:= $(hostprogs-y)
 
-# fixdep is needed to compile other host programs
-$(addprefix $(obj)/,$(always)): $(objtree)/scripts/basic/fixdep
-
 # Generated files need additional love
 
 # This trick decreases amount of rebuilds
-- 
1.6.3.3



More information about the busybox-cvs mailing list