ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/src/trunk/Makefile.inc1

Comparing trunk/Makefile.inc1 (file contents):
Revision 7394 by laffer1, Sun Jan 3 17:16:20 2016 UTC vs.
Revision 7545 by laffer1, Thu Apr 21 01:55:44 2016 UTC

#	Line 212 | Line 212 | BOOTSTRAPPING?=        0
212
213		# Common environment for world related stages
214		CROSSENV=       MAKEOBJDIRPREFIX=${OBJTREE} \
215	+	MACHINE_INCLUDES="${WORLDTMP}/include" \
216		MACHINE_ARCH=${TARGET_ARCH} \
217		MACHINE=${TARGET} \
218		CPUTYPE=${TARGET_CPUTYPE}
#	Line 226 | Line 227 | CROSSENV+=     GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
227
228		# bootstrap-tools stage
229		BMAKEENV=       INSTALL="sh ${.CURDIR}/tools/install.sh" \
230	+	MACHINE_INCLUDES="${WORLDTMP}/include" \
231		PATH=${BPATH}:${PATH} \
232		WORLDTMP=${WORLDTMP} \
233		VERSION="${VERSION}" \
#	Line 259 | Line 261 | XMAKE=         TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
261		WMAKEENV=       ${CROSSENV} \
262		_SHLIBDIRPREFIX=${WORLDTMP} \
263		_LDSCRIPTROOT= \
264	+	MACHINE_INCLUDES="${WORLDTMP}/include" \
265		VERSION="${VERSION}" \
266		INSTALL="sh ${.CURDIR}/tools/install.sh" \
267		PATH=${TMPPATH}
#	Line 310 | Line 313 | LIB32WMAKEENV+=        MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
313		CXX="${CXX} ${LIB32FLAGS}" \
314		LIBDIR=/usr/lib32 \
315		SHLIBDIR=/usr/lib32 \
316	+	LIBPRIVATEDIR=/usr/lib32/private \
317	+	MACHINE_INCLUDES="${WORLDTMP}/include" \
318		COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
319
320		LIB32WMAKE=     ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines