diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-12-29 18:08:35 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-12-29 18:08:35 +0000 |
| commit | 8701bb8faeeef094292ba5f23b3b1a2546d9e449 (patch) | |
| tree | 573311067d5d4929b0b506e0ffdf3472b40dca32 /stand/defs.mk | |
| parent | 06d6750e0d9647298da760c0e69d9479ac207c14 (diff) | |
| download | src-8701bb8faeeef094292ba5f23b3b1a2546d9e449.tar.gz src-8701bb8faeeef094292ba5f23b3b1a2546d9e449.zip | |
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
Notes
Notes:
svn path=/head/; revision=327351
Diffstat (limited to 'stand/defs.mk')
| -rw-r--r-- | stand/defs.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/stand/defs.mk b/stand/defs.mk index 8d4be1ee767c..79e52690a599 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -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 |