Date: Wed, 7 Dec 2005 21:45:12 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 87862 for review Message-ID: <200512072145.jB7LjCNh087941@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=87862 Change 87862 by soc-andrew@soc-andrew_serv on 2005/12/07 21:44:21 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#7 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.526 2005/12/03 05:11:07 ambrisko Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.530 2005/12/07 20:01:12 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -209,7 +209,12 @@ # 32 bit world LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 -LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT +.if empty(CPUTYPE) +LIB32CPUTYPE= k8 +.else +LIB32CPUTYPE= ${CPUTYPE} +.endif +LIB32PREFLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 @@ -280,7 +285,7 @@ .endif .else rm -rf ${WORLDTMP}/legacy/usr/include - # XXX - These two can depend on any header file. +# XXX - These two can depend on any header file. rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif @@ -470,7 +475,7 @@ buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} ${SHELL} || true + @cd ${.CURDIR} && env ${WMAKEENV} sh || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} @@ -892,24 +897,20 @@ # # cross-tools: Build cross-building tools # -.if (${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386") && \ - ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif - -.if (!defined(NO_RESCUE) || defined(RELEASEDIR)) && \ - ${TARGET_ARCH} != ${MACHINE_ARCH} +.if !defined(NO_RESCUE) || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif - -.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "alpha" _elf2exe= usr.sbin/elf2exe .endif - -.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ - defined(RELEASEDIR) +.if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) _kgzip= usr.sbin/kgzip .endif +.endif cross-tools: .for _tool in \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512072145.jB7LjCNh087941>