From owner-svn-src-all@freebsd.org  Sun Oct 22 03:52:09 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 6E718E46EEB;
 Sun, 22 Oct 2017 03:52:09 +0000 (UTC) (envelope-from imp@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 3BEA87777D;
 Sun, 22 Oct 2017 03:52:09 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9M3q8Ub028067;
 Sun, 22 Oct 2017 03:52:08 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M3q8VX028066;
 Sun, 22 Oct 2017 03:52:08 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201710220352.v9M3q8VX028066@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 22 Oct 2017 03:52:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324842 - head/sys/boot
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sys/boot
X-SVN-Commit-Revision: 324842
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 03:52:09 -0000

Author: imp
Date: Sun Oct 22 03:52:08 2017
New Revision: 324842
URL: https://svnweb.freebsd.org/changeset/base/324842

Log:
  Introduce BOOTOBJ: The top level object directory for the boot tree
  and use it in preference to spelling out the path.
  
  Sponsored by: Netflix

Modified:
  head/sys/boot/defs.mk

Modified: head/sys/boot/defs.mk
==============================================================================
--- head/sys/boot/defs.mk	Sun Oct 22 03:52:03 2017	(r324841)
+++ head/sys/boot/defs.mk	Sun Oct 22 03:52:08 2017	(r324842)
@@ -11,13 +11,15 @@ LDR_MI=		${BOOTDIR}/common
 SASRC=		${BOOTDIR}/libsa
 SYSDIR=		${SRCTOP}/sys
 
+BOOTOBJ=	${OBJTOP}/sys/boot
+
 # NB: The makefiles depend on these being empty when we don't build forth.
 .if ${MK_FORTH} != "no"
-LIBFICL=	${OBJTOP}/sys/boot/ficl/libficl.a
-LIBFICL32=	${OBJTOP}/sys/boot/ficl32/libficl.a
+LIBFICL=	${BOOTOBJ}/ficl/libficl.a
+LIBFICL32=	${BOOTOBJ}/ficl32/libficl.a
 .endif
-LIBSA=		${OBJTOP}/sys/boot/libsa/libsa.a
-LIBSA32=	${OBJTOP}/sys/boot/libsa32/libsa32.a
+LIBSA=		${BOOTOBJ}/libsa/libsa.a
+LIBSA32=	${BOOTOBJ}/libsa32/libsa32.a
 
 # Standard options: