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/examples/etc | |
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/examples/etc')
-rw-r--r-- | share/examples/etc/make.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 0c3f1d4..023a45f 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -29,7 +29,9 @@ # Alpha/AXP architecture: ev6 pca56 ev56 ev5 ev45 ev4 # Intel ia64 architecture: itanium # -#CPUTYPE=i686 +# (?= allows to buildworld for a different CPUTYPE.) +# +#CPUTYPE?=i686 #NO_CPU_CFLAGS= true # Don't add -march=<cpu> to CFLAGS automatically #NO_CPU_COPTFLAGS=true # Don't add -march=<cpu> to COPTFLAGS automatically # |