ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/trunk/Makefile.inc1
(Generate patch)

Comparing trunk/Makefile.inc1 (file contents):
Revision 2742 by laffer1, Sun Apr 5 23:02:05 2009 UTC vs.
Revision 2744 by laffer1, Sun Apr 5 23:35:06 2009 UTC

# Line 1 | Line 1
1   #
2   # $FreeBSD: src/Makefile.inc1,v 1.499.2.7 2006/01/07 19:40:08 netchild Exp $
3 < # $MidnightBSD: src/Makefile.inc1,v 1.14 2009/04/05 22:48:21 laffer1 Exp $
3 > # $MidnightBSD: src/Makefile.inc1,v 1.15 2009/04/05 23:02:05 laffer1 Exp $
4   #
5   # Make command line options:
6   #       -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# Line 103 | Line 103 | OSRELDATE=     0
103   .endif
104   .endif
105  
106 + .if !defined(VERSION)
107 + VERSION!=       uname -srp
108 + VERSION+=       ${OSRELDATE}
109 + .endif
110 +
111   # Guess machine architecture from machine type, and vice versa.
112   .if !defined(TARGET_ARCH) && defined(TARGET)
113 < TARGET_ARCH=    ${TARGET:S/pc98/i386/:S/sun4v/sparc64/}
113 > TARGET_ARCH=    ${TARGET:S/sun4v/sparc64/}
114   .elif !defined(TARGET) && defined(TARGET_ARCH) && \
115      ${TARGET_ARCH} != ${MACHINE_ARCH}
116   TARGET=         ${TARGET_ARCH}
# Line 202 | Line 207 | CROSSENV=      MAKEOBJDIRPREFIX=${OBJTREE} \
207   BMAKEENV=       INSTALL="sh ${.CURDIR}/tools/install.sh" \
208                  PATH=${BPATH}:${PATH} \
209                  WORLDTMP=${WORLDTMP} \
210 +                VERSION=${VERSION} \
211                  MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
212   BMAKE=          MAKEOBJDIRPREFIX=${WORLDTMP} \
213                  ${BMAKEENV} ${MAKE} -f Makefile.inc1 \
# Line 235 | Line 241 | WMAKE=         ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=$
241   LIB32TMP=       ${OBJTREE}${.CURDIR}/lib32
242  
243   .if empty(TARGET_CPUTYPE)
244 < LIB32CPUTYPE=   k8
244 > LIB32CPUTYPE=   -march=i686 -mmmx -msse -msse2
245   .else
246   LIB32CPUTYPE=   ${TARGET_CPUTYPE}
247   .endif

Comparing trunk/Makefile.inc1 (property cvs2svn:cvs-rev):
Revision 2742 by laffer1, Sun Apr 5 23:02:05 2009 UTC vs.
Revision 2744 by laffer1, Sun Apr 5 23:35:06 2009 UTC

# Line 1 | Line 1
1 < 1.15
1 > 1.16

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines