Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Jan 1999 11:40:51 +0200 (SAT)
From:      John Hay <jhay@mikom.csir.co.za>
To:        current@FreeBSD.ORG
Subject:   Re: /usr/obj/elf, /usr/obj/aout, /usr/obj - breaks make all vs make buildworld, and other things.  Time to make elf the default
Message-ID:  <199901120940.LAA24068@zibbi.mikom.csir.co.za>
In-Reply-To: <199901120606.IAA20136@zibbi.mikom.csir.co.za> from John Hay at "Jan 12, 99 08:06:31 am"

next in thread | previous in thread | raw e-mail | index | archive | help
Ok, make world and make release have completed without a problem with this
patch.

I'd like to commit it, but first want to know if there is serious complaints
about it.

The effect is that /usr/obj/elf is no longer used for the elf objects.
So if you do a make world and then later go and recompile something in
a subdirectory, it will use the same obj directory. Also snaps and
release source tarballs won't have the stray .o files anymore.

The old /usr/obj/elf directory won't be automaticaly deleted. That will
have to be done manually. Maybe we should put something in src/UPDATING
about it?

John
-- 
John Hay -- John.Hay@mikom.csir.co.za


--- Makefile.inc0.org	Mon Dec 21 10:30:44 1998
+++ Makefile.inc0	Mon Jan 11 14:32:31 1999
@@ -18,7 +18,9 @@
 # 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 @@
 #
 # 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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199901120940.LAA24068>