diff options
author | John Baldwin <jhb@FreeBSD.org> | 2002-07-31 03:56:03 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2002-07-31 03:56:03 +0000 |
commit | 22e256fdedd126d908129312e3ec425a490e3541 (patch) | |
tree | f1a3fc2fe20ea1fd661ed237f12d471bb73911ab /Makefile.inc1 | |
parent | f568e52ec8089b2687c1da16e58a911c82f22e97 (diff) | |
download | src-22e256fdedd126d908129312e3ec425a490e3541.tar.gz src-22e256fdedd126d908129312e3ec425a490e3541.zip |
- Define NO_CPU_CFLAGS during BMAKE and TMAKE (and thus XMAKE) so that
bsd.cpu.mk doesn't have to worry about compilers other than the current
version.
- Allow TARGET_CPUTYPE to override CPUTYPE in bsd.cpu.mk.
- Treat an empty CPUTYPE the same as an undefined CPUTYPE.
- For buildworld, buildkernel, etc., define TARGET_CPUTYPE to CPUTYPE for
native builds and define it to be empty for cross-builds.
TARGET_CPUTYPE is only defined if it is not already defined via the
commandline or environment.
Notes
Notes:
svn path=/head/; revision=101015
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index d5e72e2af53b..9bb522f088ff 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -126,8 +126,10 @@ MAKEOBJDIRPREFIX?= /usr/obj TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} +TARGET_CPUTYPE?= ${CPUTYPE} .else TARGET?= ${TARGET_ARCH} +TARGET_CPUTYPE?= .endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch @@ -184,13 +186,14 @@ BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ - -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR # build-tool stage TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ + -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB |