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 5736 by laffer1, Sat Jan 26 23:05:37 2013 UTC vs.
Revision 7136 by laffer1, Fri Jul 24 22:31:33 2015 UTC

#	Line 1 | Line 1
1		#
2	<	# $MidnightBSD: src/Makefile.inc1,v 1.43 2012/08/19 14:05:10 laffer1 Exp $
2	>	# $MidnightBSD$
3		#
4		# Make command line options:
5		#       -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
#	Line 42 | Line 42 | TARGET_ARCH=${TARGET}
42
43		.include <bsd.own.mk>
44		.include <bsd.arch.inc.mk>
45	+	.include <bsd.compiler.mk>
46
47		# We must do share/info early so that installation of info `dir'
48		# entries works correctly.  Do it first since it is less likely to
#	Line 133 | Line 134 | VERSION+=      ${OSRELDATE}
134		.endif
135
136
137	<	KNOWN_ARCHES?=  amd64 i386 sparc64
137	>	KNOWN_ARCHES?=  amd64 i386
138		.if ${TARGET} == ${TARGET_ARCH}
139		_t=             ${TARGET}
140		.else
#	Line 234 | Line 235 | BMAKEENV=      INSTALL="sh ${.CURDIR}/tools/install.sh" \
235		PATH=${BPATH}:${PATH} \
236		WORLDTMP=${WORLDTMP} \
237		VERSION="${VERSION}" \
238	<	MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
238	>	MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
239	>	COMPILER_TYPE=${COMPILER_TYPE}
240		BMAKE=          MAKEOBJDIRPREFIX=${WORLDTMP} \
241		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
242		DESTDIR= \
#	Line 269 | Line 271 | WMAKEENV=      ${CROSSENV} \
271		.if ${MK_CDDL} == "no"
272		WMAKEENV+=      NO_CTF=1
273		.endif
274	+	.if ${CC:T:Mgcc} == "gcc"
275	+	WMAKE_COMPILER_TYPE=    gcc
276	+	.elif ${CC:T:Mclang} == "clang"
277	+	WMAKE_COMPILER_TYPE=    clang
278	+	.elif ${MK_CLANG_IS_CC} == "no"
279	+	WMAKE_COMPILER_TYPE=    gcc
280	+	.else
281	+	WMAKE_COMPILER_TYPE=    clang
282	+	.endif
283	+	WMAKEENV+=      COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
284		WMAKE=          ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
285
286		.if ${TARGET_ARCH} == "amd64"
#	Line 303 | Line 315 | LIB32WMAKEENV+=        MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
315		CC="${CC} ${LIB32FLAGS}" \
316		CXX="${CXX} ${LIB32FLAGS}" \
317		LIBDIR=/usr/lib32 \
318	<	SHLIBDIR=/usr/lib32
318	>	SHLIBDIR=/usr/lib32 \
319	>	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
320
321		LIB32WMAKE=     ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
322		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
#	Line 973 | Line 986 | update:
986		# legacy: Build compatibility shims for the next three targets
987		#
988		legacy:
989	<	.if ${BOOTSTRAPPING} < 1000 && ${BOOTSTRAPPING} != 0
990	<	@echo "ERROR: Source upgrades from versions prior to 0.1 not supported."; \
989	>	.if ${BOOTSTRAPPING} < 4000 && ${BOOTSTRAPPING} != 0
990	>	@echo "ERROR: Source upgrades from versions prior to 0.4 not supported."; \
991		false
992		.endif
993		.for _tool in tools/build
994		${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
995	<	cd ${.CURDIR}/${_tool}; \
996	<	${MAKE} DIRPRFX=${_tool}/ obj; \
997	<	${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
998	<	${MAKE} DIRPRFX=${_tool}/ depend; \
999	<	${MAKE} DIRPRFX=${_tool}/ all; \
995	>	cd ${.CURDIR}/${_tool} && \
996	>	${MAKE} DIRPRFX=${_tool}/ obj && \
997	>	${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \
998	>	${MAKE} DIRPRFX=${_tool}/ depend && \
999	>	${MAKE} DIRPRFX=${_tool}/ all && \
1000		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
1001		.endfor
1002
#	Line 1014 | Line 1027 | _mklocale=     usr.bin/mklocale
1027		_sed=           usr.bin/sed
1028		.endif
1029
1030	<	.if ${BOOTSTRAPPING} < 4015
1030	>	.if ${BOOTSTRAPPING} < 7002
1031	>	_m4=            usr.bin/m4
1032	>	.endif
1033	>
1034	>	.if ${BOOTSTRAPPING} < 7002
1035		_lex=           usr.bin/lex
1036		.endif
1037
1038	<	.if ${BOOTSTRAPPING} < 4015
1039	<	_yacc=          usr.bin/yacc
1038	>	.if ${BOOTSTRAPPING} < 7002
1039	>	_yacc=          lib/liby \
1040	>	usr.bin/yacc
1041		.endif
1042
1043		.if ${MK_BSNMP} != "no" && \
#	Line 1138 | Line 1156 | build-tools:
1156		#
1157		# cross-tools: Build cross-building tools
1158		#
1159	<	.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 4012
1159	>	.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 4016
1160		.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
1161		_btxld=         usr.sbin/btxld
1162		.endif
#	Line 1248 | Line 1266 | _prebuild_libs=        ${_kerberos5_lib_libasn1} ${_kerberos5
1266		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
1267		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
1268		${_secure_lib_libssl} lib/libsqlite3 \
1269	<	lib/libarchive lib/libfetch lib/libmagic
1269	>	lib/libarchive lib/libfetch lib/libmagic
1270		.if ${MK_LIBTHR} != "no"
1271		_lib_libthr=    lib/libthr
1272		.endif

Comparing trunk/Makefile.inc1 (property cvs2svn:cvs-rev):
Revision 5736 by laffer1, Sat Jan 26 23:05:37 2013 UTC vs.
Revision 7136 by laffer1, Fri Jul 24 22:31:33 2015 UTC

#	Line 1 | Line 0
1	–	1.44

Comparing trunk/Makefile.inc1 (property svn:keywords):
Revision 5736 by laffer1, Sat Jan 26 23:05:37 2013 UTC vs.
Revision 7136 by laffer1, Fri Jul 24 22:31:33 2015 UTC

#	Line 0 | Line 1
1	+	MidnightBSD=%H

Diff Legend

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