When building universe ensure the required worlds are finished before
starting the kernels. Before this the kernels would be built as part of the last architecture universe target. There can cause problems when this world finishes before the other worlds as the host compiler may be picked up rather than the target compiler. The solution is to add a target to build the universe kernels that depends on all the world targets finishing. As we may not be building a world only depend on it when MAKE_JUST_KERNELS is undefined.
This commit is contained in:
parent
b5aaf7b22b
commit
10098a6ec2
8
Makefile
8
Makefile
@ -392,6 +392,14 @@ universe_${target}_${target_arch}: universe_${target}_prologue
|
||||
.endfor
|
||||
.endif
|
||||
.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}_prologue
|
||||
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
|
||||
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
|
||||
${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
|
||||
|
Loading…
Reference in New Issue
Block a user