Date: Sun, 29 Mar 2015 15:43:24 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280808 - head/sys/boot Message-ID: <201503291543.t2TFhPrL082252@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503291543.t2TFhPrL082252>