Date: Fri, 29 Dec 2017 18:08:35 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327351 - head/stand Message-ID: <201712291808.vBTI8Z7Z045048@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Dec 29 18:08:35 2017 New Revision: 327351 URL: https://svnweb.freebsd.org/changeset/base/327351 Log: Fix ubldr. uboot/lib uses defines for the loader. It's part of the loader, but not compile as loader (it's building a library), so we can't just include loader.mk for the defines. Move LOADER_DISK_SUPPORT back to defs.mk for the moment. Sponsored by: Netflix Modified: head/stand/defs.mk head/stand/loader.mk Modified: head/stand/defs.mk ============================================================================== --- head/stand/defs.mk Fri Dec 29 18:08:30 2017 (r327350) +++ head/stand/defs.mk Fri Dec 29 18:08:35 2017 (r327351) @@ -58,6 +58,13 @@ LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .endif # MK_LOADER_GELI .endif # HAVE_GELI +# These should be confined to loader.mk, but can't because uboot/lib +# also uses it. It's part of loader, but isn't a loader so we can't +# just include loader.mk +.if ${LOADER_DISK_SUPPORT:Uyes} == "yes" +CFLAGS+= -DLOADER_DISK_SUPPORT +.endif + # Machine specific flags for all builds here # All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc Modified: head/stand/loader.mk ============================================================================== --- head/stand/loader.mk Fri Dec 29 18:08:30 2017 (r327350) +++ head/stand/loader.mk Fri Dec 29 18:08:35 2017 (r327351) @@ -105,15 +105,12 @@ CFLAGS+= -DLOADER_NFS_SUPPORT CFLAGS+= -DLOADER_TFTP_SUPPORT .endif -# Disk and partition support -.if ${LOADER_DISK_SUPPORT:Uyes} == "yes" -CFLAGS+= -DLOADER_DISK_SUPPORT +# Partition support .if ${LOADER_GPT_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GPT_SUPPORT .endif .if ${LOADER_MBR_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_MBR_SUPPORT -.endif .endif .if defined(HAVE_ZFS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712291808.vBTI8Z7Z045048>