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.
This commit is contained in:
parent
cfaf34ff99
commit
4ef84196c9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=280808
@ -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>
|
||||
|
@ -8,3 +8,5 @@ SUBDIR+= userboot
|
||||
.if ${MK_FORTH} != "no"
|
||||
SUBDIR+= ficl32
|
||||
.endif
|
||||
|
||||
SUBDIR+= i386
|
||||
|
Loading…
Reference in New Issue
Block a user