View | Details | Raw Unified | Return to bug 254319
Collapse All | Expand All

(-)b/release/release.sh (-3 / +4 lines)
Lines 170-175 env_check() { Link Here
170
	# The aggregated build-time flags based upon variables defined within
170
	# The aggregated build-time flags based upon variables defined within
171
	# this file, unless overridden by release.conf.  In most cases, these
171
	# this file, unless overridden by release.conf.  In most cases, these
172
	# will not need to be changed.
172
	# will not need to be changed.
173
	NOCONF_FILES="__MAKE_CONF=/dev/null SRCCONF=/dev/null"
173
	CONF_FILES="__MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF}"
174
	CONF_FILES="__MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF}"
174
	if [ -n "${TARGET}" ] && [ -n "${TARGET_ARCH}" ]; then
175
	if [ -n "${TARGET}" ] && [ -n "${TARGET_ARCH}" ]; then
175
		ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
176
		ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
Lines 194-202 env_check() { Link Here
194
195
195
	CHROOT_MAKEENV="${CHROOT_MAKEENV} \
196
	CHROOT_MAKEENV="${CHROOT_MAKEENV} \
196
		MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
197
		MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
197
	CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
198
	CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${NOCONF_FILES}"
198
	CHROOT_IMAKEFLAGS="${WORLD_FLAGS} ${CONF_FILES}"
199
	CHROOT_IMAKEFLAGS="${WORLD_FLAGS} ${NOCONF_FILES}"
199
	CHROOT_DMAKEFLAGS="${WORLD_FLAGS} ${CONF_FILES}"
200
	CHROOT_DMAKEFLAGS="${WORLD_FLAGS} ${NOCONF_FILES}"
200
	RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} \
201
	RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} \
201
		${CONF_FILES}"
202
		${CONF_FILES}"
202
	RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \
203
	RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \

Return to bug 254319