aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2015-06-16 18:43:08 +0000
committerAndrew Turner <andrew@FreeBSD.org>2015-06-16 18:43:08 +0000
commit149da95c87e41e09e81f77cb20d8753bf8c17233 (patch)
tree045d15c6aa2abc753ae34466ba96de0ef2c0e046 /Makefile
parent35c9a2a9a178157ba7f22db4f44d28f1f81db177 (diff)
downloadsrc-149da95c87e41e09e81f77cb20d8753bf8c17233.tar.gz
src-149da95c87e41e09e81f77cb20d8753bf8c17233.zip
Add a universe_${target}_worlds target to simplify the logic to find when
to start building kernels. Obtained from: ABT Systems Ltd
Notes
Notes: svn path=/head/; revision=284456
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 4287ac9cc6e9..8a487af984df 100644
--- a/Makefile
+++ b/Makefile
@@ -438,9 +438,12 @@ universe_epilogue: universe_${target}
universe_${target}: universe_${target}_prologue
universe_${target}_prologue: universe_prologue
@echo ">> ${target} started on `LC_ALL=C date`"
+universe_${target}_worlds:
+
.if !defined(MAKE_JUST_KERNELS)
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}: universe_${target}_${target_arch}
+universe_${target}_worlds: universe_${target}_${target_arch}
universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
@@ -456,13 +459,8 @@ universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
.endif # !MAKE_JUST_KERNELS
.if !defined(MAKE_JUST_WORLDS)
-# If we are building world and kernels wait for the required worlds to finish
-.if !defined(MAKE_JUST_KERNELS)
-.for target_arch in ${TARGET_ARCHES_${target}}
-universe_${target}_kernels: universe_${target}_${target_arch}
-.endfor
-.endif
universe_${target}: universe_${target}_kernels
+universe_${target}_kernels: universe_${target}_worlds
universe_${target}_kernels: universe_${target}_prologue .MAKE
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \