diff options
| author | ru <ru@FreeBSD.org> | 2002-08-02 18:04:22 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-08-02 18:04:22 +0000 |
| commit | 55b49dda708142da93e81d81bea0aaa065a226d4 (patch) | |
| tree | cf954f8ddb756ce0c32eb6ad33865187d8f1c050 /share/mk | |
| parent | a14a8c551ee3e10a15c1cd17dad3d188e560567c (diff) | |
| download | FreeBSD-src-55b49dda708142da93e81d81bea0aaa065a226d4.zip FreeBSD-src-55b49dda708142da93e81d81bea0aaa065a226d4.tar.gz | |
TARGET_CPUTYPE should exist solely in Makefile.inc1, similar to
TARGET_ARCH and TARGET. This is problematic when one has the =
(unconditional) type of assigment for CPUTYPE in /etc/make.conf.
(This would override what was set on the command line to "make
buildworld".)
Add a (horrible) kludge to Makefile.inc1 to check the type of
assignment for CPUTYPE (only for those who attempts to set it to
a different value). Fix an example make.conf. Fix the kernel's
build-tools target (aicasm only at the moment) to catch up with
bsd.cpu.mk,v 1.15 (BOOTSTRAPPING replaced with NO_CPU_CFLAGS in
Makefile.inc1's BMAKE).
Reviewed by: jhb
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.cpu.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 7a9d7e2..1fd7427 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -1,16 +1,10 @@ # $FreeBSD$ -# Allow TARGET_CPUTYPE to override CPUTYPE to handle the cross-build case. - -.if defined(TARGET_CPUTYPE) -CPUTYPE = ${TARGET_CPUTYPE} -.endif - # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but # may tune support for more advanced processors. -.if !defined(CPUTYPE) || ${CPUTYPE} == "" +.if !defined(CPUTYPE) || empty(CPUTYPE) . if ${MACHINE_ARCH} == "i386" _CPUCFLAGS = -mcpu=pentiumpro CPUTYPE = i386 |
