From owner-freebsd-current Tue Jan 12 01:43:02 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id BAA24036 for freebsd-current-outgoing; Tue, 12 Jan 1999 01:43:02 -0800 (PST) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from zibbi.mikom.csir.co.za (zibbi.mikom.csir.co.za [146.64.24.58]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id BAA23743 for ; Tue, 12 Jan 1999 01:41:34 -0800 (PST) (envelope-from jhay@zibbi.mikom.csir.co.za) Received: (from jhay@localhost) by zibbi.mikom.csir.co.za (8.9.1/8.9.1) id LAA24068 for current@FreeBSD.ORG; Tue, 12 Jan 1999 11:40:51 +0200 (SAT) From: John Hay Message-Id: <199901120940.LAA24068@zibbi.mikom.csir.co.za> 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 In-Reply-To: <199901120606.IAA20136@zibbi.mikom.csir.co.za> from John Hay at "Jan 12, 99 08:06:31 am" To: current@FreeBSD.ORG Date: Tue, 12 Jan 1999 11:40:51 +0200 (SAT) X-Mailer: ELM [version 2.4ME+ PL32 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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