diff options
| author | emaste <emaste@FreeBSD.org> | 2016-01-07 20:34:06 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-01-07 20:34:06 +0000 |
| commit | ab9ee23babb52c55edb1827979d1a02d91577aec (patch) | |
| tree | b7d680479b1451bcfe8cf33aace5f6efce40da68 | |
| parent | 926d90c28b75914636f625a4fc226679f64465ec (diff) | |
| download | FreeBSD-src-ab9ee23babb52c55edb1827979d1a02d91577aec.zip FreeBSD-src-ab9ee23babb52c55edb1827979d1a02d91577aec.tar.gz | |
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.
| -rw-r--r-- | sys/boot/Makefile | 6 | ||||
| -rw-r--r-- | sys/boot/Makefile.amd64 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/Makefile b/sys/boot/Makefile index 3b098e9..4b30df4 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -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> diff --git a/sys/boot/Makefile.amd64 b/sys/boot/Makefile.amd64 index 2b85283..384cf7a 100644 --- a/sys/boot/Makefile.amd64 +++ b/sys/boot/Makefile.amd64 @@ -8,3 +8,5 @@ SUBDIR+= userboot .if ${MK_FORTH} != "no" SUBDIR+= ficl32 .endif + +SUBDIR+= i386 |
