diff options
| author | andrew <andrew@FreeBSD.org> | 2015-05-05 10:32:59 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2015-05-05 10:32:59 +0000 |
| commit | 5bf47c36d02c1d2b39a716a10f5facafc61fe64a (patch) | |
| tree | 02b9b3059456737790b50132245d4d7eff6c82c3 | |
| parent | 79ad4db27682d3b47ae4ed2ed9b281167ec537ff (diff) | |
| download | FreeBSD-src-5bf47c36d02c1d2b39a716a10f5facafc61fe64a.zip FreeBSD-src-5bf47c36d02c1d2b39a716a10f5facafc61fe64a.tar.gz | |
When cross-building ${LIBSTAND} may be set to the host copy. Point to the
version built with the toolchain.
Differential Revision: https://reviews.freebsd.org/D2312
Submitted by: jhb
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 5585f78..06e76a9 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -38,6 +38,12 @@ CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -I${.CURDIR}/../../i386/libi386 CFLAGS+= -DNO_PCI -DEFI +# make buildenv doesn't set DESTDIR, this means LIBSTAND +# will be wrong when crossbuilding. +.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.endif + .if ${MK_FORTH} != "no" BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH |
