From owner-svn-src-head@freebsd.org Fri Nov 3 00:29:44 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C4D5E66500; Fri, 3 Nov 2017 00:29:44 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DE4126F271; Fri, 3 Nov 2017 00:29:43 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA30Thvk037436; Fri, 3 Nov 2017 00:29:43 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA30TgYq037434; Fri, 3 Nov 2017 00:29:42 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711030029.vA30TgYq037434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Nov 2017 00:29:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325350 - in head: . targets/pseudo/bootstrap-tools X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . targets/pseudo/bootstrap-tools X-SVN-Commit-Revision: 325350 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Nov 2017 00:29:44 -0000 Author: bdrewery Date: Fri Nov 3 00:29:42 2017 New Revision: 325350 URL: https://svnweb.freebsd.org/changeset/base/325350 Log: Follow-up r325329: Store all WORLDTMP objects back in the same directory. This still keeps the reduced MAKEOBJDIRPREFIX (SRCTOP) redundancy removed in the OBJDIR, but now keeps all early phase objects in the same directory rather than split per phase. The problem of splitting per phase is that later phases want to link in libraries from earlier phases and base their location on ${OBJTOP}. Pointyhat to: bdrewery Reported by: mjoras, Mark Millard Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 head/targets/pseudo/bootstrap-tools/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Nov 3 00:12:32 2017 (r325349) +++ head/Makefile.inc1 Fri Nov 3 00:29:42 2017 (r325350) @@ -521,7 +521,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile BSARGS= DESTDIR= \ - OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \ + OBJTOP='${WORLDTMP}/obj-tools' \ OBJROOT='$${OBJTOP}/' \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ Modified: head/targets/pseudo/bootstrap-tools/Makefile ============================================================================== --- head/targets/pseudo/bootstrap-tools/Makefile Fri Nov 3 00:12:32 2017 (r325349) +++ head/targets/pseudo/bootstrap-tools/Makefile Fri Nov 3 00:29:42 2017 (r325350) @@ -34,7 +34,7 @@ OSRELDATE?= 0 # need to keep this in sync with src/Makefile.inc1 BSARGS= DESTDIR= \ - OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \ + OBJTOP='${WORLDTMP}/obj-tools' \ OBJROOT='$${OBJTOP}/' \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET} \