diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2015-03-29 15:43:24 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2015-03-29 15:43:24 +0000 |
| commit | 4ef84196c94d23547965074fee381365b7f56338 (patch) | |
| tree | 94df8f7b2bbcb3a3d5cce5bb406638882a76b5ae /sys/boot/Makefile | |
| parent | cfaf34ff99d2a8d9a405b61a4dca7a951028b4d9 (diff) | |
| download | src-test-4ef84196c94d23547965074fee381365b7f56338.tar.gz src-test-4ef84196c94d23547965074fee381365b7f56338.zip | |
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.
Notes
Notes:
svn path=/head/; revision=280808
Diffstat (limited to 'sys/boot/Makefile')
| -rw-r--r-- | sys/boot/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/boot/Makefile b/sys/boot/Makefile index 2984bd5c89cfa..172255e21057c 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -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> |