Author: andrew
Date: Tue May 5 10:32:59 2015
New Revision: 282470
URL: https://svnweb.freebsd.org/changeset/base/282470
Log:
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
Modified:
head/sys/boot/efi/loader/Makefile
Modified: head/sys/boot/efi/loader/Makefile
==============================================================================
--- head/sys/boot/efi/loader/Makefile Tue May 5 10:19:43 2015
(r282469)
+++ head/sys/boot/efi/loader/Makefile Tue May 5 10:32:59 2015
(r282470)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
