diff options
| author | jhay <jhay@FreeBSD.org> | 1999-01-14 06:45:53 +0000 |
|---|---|---|
| committer | jhay <jhay@FreeBSD.org> | 1999-01-14 06:45:53 +0000 |
| commit | 8b3ed11b5b760073779afb049d28fe1062b523c4 (patch) | |
| tree | db35ea1f3f26aca9223e819b42b4a33b2eb47606 /Makefile.inc0 | |
| parent | b5fcc979e2fe24c1087aa899e9e0deb57b1ae78f (diff) | |
| download | FreeBSD-src-8b3ed11b5b760073779afb049d28fe1062b523c4.zip FreeBSD-src-8b3ed11b5b760073779afb049d28fe1062b523c4.tar.gz | |
Don't use /usr/obj/elf for make world anymore.
NOTE: Your old /usr/obj/elf won't be deleted automagicaly, you will have to
do it yourself.
Diffstat (limited to 'Makefile.inc0')
| -rw-r--r-- | Makefile.inc0 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.inc0 b/Makefile.inc0 index 7b2a9bc..7b82b88 100644 --- a/Makefile.inc0 +++ b/Makefile.inc0 @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc0,v 1.12 1998/12/16 11:45:51 ache Exp $ +# $Id: Makefile.inc0,v 1.13 1998/12/20 14:30:08 jhay Exp $ # # This makefile ensures that the object directory is set according to the # object format to avoid mixing aout and elf formatted files during the @@ -18,7 +18,9 @@ MAKEOBJDIRPREFIX?=/usr/obj # Variables passed to make work better if they are set as environment # variables instead of command line options. # +.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "aout" MK_ENV= MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${OBJFORMAT} +.endif # # We should always use the current set of mk files, not the installed ones. @@ -51,7 +53,7 @@ ${RELTGTS} : # # Temporary path and environment for the legacy build. # -ELFTMP= ${MAKEOBJDIRPREFIX}/elf${.CURDIR}/tmp +ELFTMP= ${MAKEOBJDIRPREFIX}${.CURDIR}/tmp ELFTMPPATH= ${ELFTMP}/sbin:${ELFTMP}/bin:${ELFTMP}/usr/sbin:${ELFTMP}/usr/bin:${ELFTMP}/usr/games LEGACY_ENV= PATH=${ELFTMPPATH} OBJFORMAT=aout NOTOOLS=1 TOOLROOT=${ELFTMP} \ MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout |
