Page MenuHomeFreeBSD
Files F131930273

D41544.id126352.diff
No OneTemporary
Actions

D41544.id126352.diff
View Options

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -509,19 +509,23 @@
tinderbox toolchains kernel-toolchains kernels worlds: upgrade_checks
tinderbox: .PHONY
- @cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES universe
+ @cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES _universe
toolchains: .PHONY
- @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe
+ @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=toolchain _universe
kernel-toolchains: .PHONY
- @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
+ @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain _universe
kernels: .PHONY
- @cd ${.CURDIR}; ${SUB_MAKE} universe -DWITHOUT_WORLDS
+ @cd ${.CURDIR}; ${SUB_MAKE} _universe -DWITHOUT_WORLDS
worlds: .PHONY
- @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe
+ @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld _universe
+
+targets universe universe-toolchain: upgrade_checks
+targets universe universe-toolchain: .PHONY
+ @cd ${.CURDIR}; ${SUB_MAKE} _${.TARGET}
#
# universe
@@ -530,8 +534,8 @@
# with a reasonable chance of success, regardless of how old your
# existing system is.
#
-.if make(universe) || make(universe_kernels) || make(tinderbox) || \
- make(targets) || make(universe-toolchain)
+.if make(_universe) || make(_universe_kernels) || \
+ make(_targets) || make(_universe-toolchain)
#
# Don't build rarely used, semi-supported architectures unless requested.
#
@@ -567,9 +571,9 @@
.for toolchain in ${TOOLCHAINS_${target}}
.if !exists(/usr/local/share/toolchains/${toolchain}.mk)
_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:N${target}}
-universe: universe_${toolchain}_skip .PHONY
-universe_epilogue: universe_${toolchain}_skip .PHONY
-universe_${toolchain}_skip: universe_prologue .PHONY
+_universe: _universe_${toolchain}_skip .PHONY
+_universe_epilogue: _universe_${toolchain}_skip .PHONY
+_universe_${toolchain}_skip: _universe_prologue .PHONY
@echo ">> ${target} skipped - install ${toolchain} port or package to build"
.endif
.endfor
@@ -583,7 +587,7 @@
UNIVERSE_TARGET?= buildworld
KERNSRCDIR?= ${.CURDIR}/sys
-targets: .PHONY
+_targets: .PHONY
@echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
.for target in ${TARGETS}
.for target_arch in ${TARGET_ARCHES_${target}}
@@ -598,9 +602,8 @@
MAKEFAIL=cat
.endif
-universe_prologue: upgrade_checks
-universe: universe_prologue
-universe_prologue: .PHONY
+_universe: _universe_prologue
+_universe_prologue: .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> make universe started on ${STARTTIME}"
@echo "--------------------------------------------------------------"
@@ -608,7 +611,7 @@
@rm -f ${FAILFILE}
.endif
-universe-toolchain: .PHONY universe_prologue
+_universe-toolchain: .PHONY _universe_prologue
@echo "--------------------------------------------------------------"
@echo "> Toolchain bootstrap started on `LC_ALL=C date`"
@echo "--------------------------------------------------------------"
@@ -621,9 +624,9 @@
TOOLS_PREFIX_UNDEF= \
kernel-toolchain \
MK_LLVM_TARGET_ALL=yes \
- > _.${.TARGET} 2>&1 || \
- (echo "${.TARGET} failed," \
- "check _.${.TARGET} for details" | \
+ > _.${.TARGET:S/^_//} 2>&1 || \
+ (echo "${.TARGET:S/^_//} failed," \
+ "check _.${.TARGET:S/^_//} for details" | \
${MAKEFAIL}; false)
@if [ ! -e "${HOST_OBJTOP}/tmp/usr/bin/cc" ]; then \
echo "Missing host compiler at ${HOST_OBJTOP}/tmp/usr/bin/cc?" >&2; \
@@ -638,14 +641,14 @@
@echo "--------------------------------------------------------------"
.for target in ${_UNIVERSE_TARGETS}
-universe: universe_${target}
-universe_epilogue: universe_${target}
-universe_${target}: universe_${target}_prologue .PHONY
-universe_${target}_prologue: universe_prologue .PHONY
+_universe: _universe_${target}
+_universe_epilogue: _universe_${target}
+_universe_${target}: _universe_${target}_prologue .PHONY
+_universe_${target}_prologue: _universe_prologue .PHONY
@echo ">> ${target} started on `LC_ALL=C date`"
-universe_${target}_worlds: .PHONY
+_universe_${target}_worlds: .PHONY
-.if !make(targets) && !make(universe-toolchain)
+.if !make(_targets) && !make(_universe-toolchain)
.for target_arch in ${TARGET_ARCHES_${target}}
.if !defined(_need_clang_${target}_${target_arch})
_need_clang_${target}_${target_arch} != \
@@ -687,20 +690,20 @@
XLD="${HOST_OBJTOP}/tmp/usr/bin/ld"
.endif
.endfor
-.endif # !make(targets)
+.endif # !make(_targets) && !make(_universe-toolchain)
.if ${__DO_WORLDS} == "yes"
-universe_${target}_done: universe_${target}_worlds .PHONY
+_universe_${target}_done: _universe_${target}_worlds .PHONY
.for target_arch in ${TARGET_ARCHES_${target}}
-universe_${target}_worlds: universe_${target}_${target_arch} .PHONY
+_universe_${target}_worlds: _universe_${target}_${target_arch} .PHONY
.if (defined(_need_clang_${target}_${target_arch}) && \
${_need_clang_${target}_${target_arch}} == "yes") || \
(defined(_need_lld_${target}_${target_arch}) && \
${_need_lld_${target}_${target_arch}} == "yes")
-universe_${target}_${target_arch}: universe-toolchain
-universe_${target}_prologue: universe-toolchain
+_universe_${target}_${target_arch}: _universe-toolchain
+_universe_${target}_prologue: _universe-toolchain
.endif
-universe_${target}_${target_arch}: universe_${target}_prologue .MAKE .PHONY
+_universe_${target}_${target_arch}: _universe_${target}_prologue .MAKE .PHONY
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
@@ -716,25 +719,25 @@
.endif # ${__DO_WORLDS} == "yes"
.if ${__DO_KERNELS} == "yes"
-universe_${target}_done: universe_${target}_kernels .PHONY
-universe_${target}_kernels: universe_${target}_worlds .PHONY
-universe_${target}_kernels: universe_${target}_prologue .MAKE .PHONY
+_universe_${target}_done: _universe_${target}_kernels .PHONY
+_universe_${target}_kernels: _universe_${target}_worlds .PHONY
+_universe_${target}_kernels: _universe_${target}_prologue .MAKE .PHONY
@cd ${.CURDIR}; ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
- universe_kernels
+ _universe_kernels
.endif # ${__DO_KERNELS} == "yes"
# Tell the user the worlds and kernels have completed
-universe_${target}: universe_${target}_done
-universe_${target}_done:
+_universe_${target}: _universe_${target}_done
+_universe_${target}_done:
@echo ">> ${target} completed on `LC_ALL=C date`"
.endfor
-.if make(universe_kernconfs) || make(universe_kernels)
+.if make(_universe_kernconfs) || make(_universe_kernels)
.if !defined(TARGET)
TARGET!= uname -m
.endif
-universe_kernels_prologue: .PHONY
+_universe_kernels_prologue: .PHONY
@echo ">> ${TARGET} kernels started on `LC_ALL=C date`"
-universe_kernels: universe_kernconfs .PHONY
+_universe_kernels: _universe_kernconfs .PHONY
@echo ">> ${TARGET} kernels completed on `LC_ALL=C date`"
.if defined(MAKE_ALL_KERNELS)
_THINNER=cat
@@ -748,7 +751,7 @@
-type f -maxdepth 0 \
! -name DEFAULTS ! -name NOTES | \
${_THINNER}
-universe_kernconfs: universe_kernels_prologue .PHONY
+_universe_kernconfs: _universe_kernels_prologue .PHONY
.for kernel in ${KERNCONFS}
TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \
env PATH=${HOST_OBJTOP}/tmp/legacy/bin:${PATH:Q} \
@@ -757,8 +760,8 @@
.if empty(TARGET_ARCH_${kernel})
.error Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old.
.endif
-universe_kernconfs_${TARGET_ARCH_${kernel}}: universe_kernconf_${TARGET}_${kernel}
-universe_kernconf_${TARGET}_${kernel}: .MAKE
+_universe_kernconfs_${TARGET_ARCH_${kernel}}: _universe_kernconf_${TARGET}_${kernel}
+_universe_kernconf_${TARGET}_${kernel}: .MAKE
@echo ">> ${TARGET}.${TARGET_ARCH_${kernel}} ${kernel} kernel started on `LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
${SUB_MAKE} ${JFLAG} buildkernel \
@@ -772,12 +775,12 @@
@echo ">> ${TARGET}.${TARGET_ARCH_${kernel}} ${kernel} kernel completed on `LC_ALL=C date`"
.endfor
.for target_arch in ${TARGET_ARCHES_${TARGET}}
-universe_kernconfs: universe_kernconfs_${target_arch} .PHONY
-universe_kernconfs_${target_arch}:
+_universe_kernconfs: _universe_kernconfs_${target_arch} .PHONY
+_universe_kernconfs_${target_arch}:
.endfor
-.endif # make(universe_kernels)
-universe: universe_epilogue
-universe_epilogue: .PHONY
+.endif # make(_universe_kernels)
+_universe: _universe_epilogue
+_universe_epilogue: .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> make universe completed on `LC_ALL=C date`"
@echo " (started ${STARTTIME})"
@@ -806,7 +809,7 @@
.export MK_DIRDEPS_BUILD MK_STAGING UPDATE_DEPENDFILE
.endif
-.if make(universe)
+.if make(_universe)
# we do not want a failure of one branch abort all.
MAKE_JOB_ERROR_TOKEN= no
.export MAKE_JOB_ERROR_TOKEN

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 13, 7:18 AM (13 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23663928
Default Alt Text
D41544.id126352.diff (8 KB)

Event Timeline