View | Details | Raw Unified | Return to bug 277269 | Differences between
and this patch

Collapse All | Expand All

(-)b/tools/tools/nanobsd/defaults.sh (-2 / +3 lines)
Lines 67-73 NANO_PKG_META_BASE=/var/db Link Here
67
# Make & parallel Make
67
# Make & parallel Make
68
NANO_MAKE="make"
68
NANO_MAKE="make"
69
NANO_NCPU=$(sysctl -n hw.ncpu)
69
NANO_NCPU=$(sysctl -n hw.ncpu)
70
NANO_PMAKE="make -j $NANO_NCPU"
70
NANO_PMAKE="" # "${NANO_MAKE} -j ${NANO_NCPU}"
71
71
72
# The default name for any image we create.
72
# The default name for any image we create.
73
NANO_IMGNAME="_.disk.full"
73
NANO_IMGNAME="_.disk.full"
Lines 905-910 set_defaults_and_export ( ) { Link Here
905
	[ -n "${NANO_NOPRIV_BUILD}" ] && [ -z "${NANO_METALOG}" ] && \
905
	[ -n "${NANO_NOPRIV_BUILD}" ] && [ -z "${NANO_METALOG}" ] && \
906
		NANO_METALOG=${NANO_OBJ}/_.metalog || true
906
		NANO_METALOG=${NANO_OBJ}/_.metalog || true
907
907
908
	NANO_PMAKE=${NANO_PMAKE:="${NANO_MAKE} -j ${NANO_NCPU}"}
909
908
	NANO_STARTTIME=`date +%s`
910
	NANO_STARTTIME=`date +%s`
909
	pprint 3 "Exporting NanoBSD variables"
911
	pprint 3 "Exporting NanoBSD variables"
910
	export_var MAKEOBJDIRPREFIX
912
	export_var MAKEOBJDIRPREFIX
911
- 

Return to bug 277269