mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-02 22:54:52 +00:00
Reapply "release.sh: Add -jN to make release
"
With the latest changes to release/Makefile, it is now possible to
run `make release -jN` without the build failing (at least in my
latest tests).
This reverts commit 7b707e797b
.
MFC after: 1 week
This commit is contained in:
parent
a1bff97300
commit
2c01e189ff
|
@ -89,9 +89,11 @@ env_setup() {
|
|||
SRC_CONF="/dev/null"
|
||||
|
||||
# The number of make(1) jobs, defaults to the number of CPUs available
|
||||
# for buildworld, and half of number of CPUs available for buildkernel.
|
||||
# for buildworld, and half of number of CPUs available for buildkernel
|
||||
# and 'make release'.
|
||||
WORLD_FLAGS="-j$(sysctl -n hw.ncpu)"
|
||||
KERNEL_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))"
|
||||
RELEASE_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))"
|
||||
|
||||
MAKE_FLAGS="-s"
|
||||
|
||||
|
@ -190,7 +192,7 @@ env_check() {
|
|||
${CONF_FILES}"
|
||||
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \
|
||||
KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
|
||||
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \
|
||||
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} ${RELEASE_FLAGS} \
|
||||
KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCPORTS} \
|
||||
WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \
|
||||
WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"
|
||||
|
|
Loading…
Reference in a new issue