From owner-svn-src-all@freebsd.org  Thu Jan  7 20:34:07 2016
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 96D62A6648B;
 Thu,  7 Jan 2016 20:34:07 +0000 (UTC)
 (envelope-from emaste@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 66D1618BB;
 Thu,  7 Jan 2016 20:34:07 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07KY6Vo034869;
 Thu, 7 Jan 2016 20:34:06 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07KY64m034867;
 Thu, 7 Jan 2016 20:34:06 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201601072034.u07KY64m034867@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 7 Jan 2016 20:34:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r293353 - stable/10/sys/boot
X-SVN-Group: stable-10
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.20
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: Thu, 07 Jan 2016 20:34:07 -0000

Author: emaste
Date: Thu Jan  7 20:34:06 2016
New Revision: 293353
URL: https://svnweb.freebsd.org/changeset/base/293353

Log:
  MFC r280808 by andrew: Reorder sys/boot/Makefile for the efi loader move
  
  As these will depend on ficl having been built, and are set via
  bsd.arch.inc.mk we need to place this after ficl.
  
  As Makefile.amd64 is now late enough we can add the i386 directory to
  this.

Modified:
  stable/10/sys/boot/Makefile
  stable/10/sys/boot/Makefile.amd64
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/Makefile
==============================================================================
--- stable/10/sys/boot/Makefile	Thu Jan  7 20:32:04 2016	(r293352)
+++ stable/10/sys/boot/Makefile	Thu Jan  7 20:34:06 2016	(r293353)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
-.include <bsd.arch.inc.mk>
 
 .if ${MK_FORTH} != "no"
 # Build the add-in FORTH interpreter.
@@ -9,13 +8,12 @@ SUBDIR+=		ficl
 SUBDIR+=		forth
 .endif
 
+.include <bsd.arch.inc.mk>
+
 # Pick the machine-dependent subdir based on the target architecture.
 ADIR=			${MACHINE:S/powerpc64/powerpc/}
 .if exists(${.CURDIR}/${ADIR}/.)
 SUBDIR+=		${ADIR}
 .endif
-.if ${MACHINE} == "amd64"
-SUBDIR+=		i386
-.endif
 
 .include <bsd.subdir.mk>

Modified: stable/10/sys/boot/Makefile.amd64
==============================================================================
--- stable/10/sys/boot/Makefile.amd64	Thu Jan  7 20:32:04 2016	(r293352)
+++ stable/10/sys/boot/Makefile.amd64	Thu Jan  7 20:34:06 2016	(r293353)
@@ -8,3 +8,5 @@ SUBDIR+=		userboot
 .if ${MK_FORTH} != "no"
 SUBDIR+=		ficl32
 .endif
+
+SUBDIR+=		i386