From owner-svn-src-all@FreeBSD.ORG  Sun Mar 29 15:43:25 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9B6223AF;
 Sun, 29 Mar 2015 15:43:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 878E51BC;
 Sun, 29 Mar 2015 15:43:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2TFhPt9082254;
 Sun, 29 Mar 2015 15:43:25 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2TFhPrL082252;
 Sun, 29 Mar 2015 15:43:25 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201503291543.t2TFhPrL082252@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 29 Mar 2015 15:43:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280808 - head/sys/boot
X-SVN-Group: head
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.18-1
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2015 15:43:25 -0000

Author: andrew
Date: Sun Mar 29 15:43:24 2015
New Revision: 280808
URL: https://svnweb.freebsd.org/changeset/base/280808

Log:
  Reorder to help with moving the efi loader parts to sys/boot/efi. 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:
  head/sys/boot/Makefile
  head/sys/boot/Makefile.amd64

Modified: head/sys/boot/Makefile
==============================================================================
--- head/sys/boot/Makefile	Sun Mar 29 15:18:04 2015	(r280807)
+++ head/sys/boot/Makefile	Sun Mar 29 15:43:24 2015	(r280808)
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
-.include <bsd.arch.inc.mk>
 
 .if ${MK_FORTH} != "no"
 # Build the add-in FORTH interpreter.
 SUBDIR+=		ficl
 .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: head/sys/boot/Makefile.amd64
==============================================================================
--- head/sys/boot/Makefile.amd64	Sun Mar 29 15:18:04 2015	(r280807)
+++ head/sys/boot/Makefile.amd64	Sun Mar 29 15:43:24 2015	(r280808)
@@ -8,3 +8,5 @@ SUBDIR+=		userboot
 .if ${MK_FORTH} != "no"
 SUBDIR+=		ficl32
 .endif
+
+SUBDIR+=		i386