Date: Thu, 7 Jan 2016 20:34:06 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> 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 Message-ID: <201601072034.u07KY64m034867@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601072034.u07KY64m034867>