svn commit: r280486 - projects/lua-bootloader/sys/boot/i386/loader

Rui Paulo rpaulo at FreeBSD.org
Wed Mar 25 06:04:41 UTC 2015


Author: rpaulo
Date: Wed Mar 25 06:04:39 2015
New Revision: 280486
URL: https://svnweb.freebsd.org/changeset/base/280486

Log:
  Add some glue to i386/loader to build with Lua support.

Modified:
  projects/lua-bootloader/sys/boot/i386/loader/Makefile

Modified: projects/lua-bootloader/sys/boot/i386/loader/Makefile
==============================================================================
--- projects/lua-bootloader/sys/boot/i386/loader/Makefile	Wed Mar 25 06:03:34 2015	(r280485)
+++ projects/lua-bootloader/sys/boot/i386/loader/Makefile	Wed Mar 25 06:04:39 2015	(r280486)
@@ -48,6 +48,11 @@ LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .endif
 .endif
 
+.if ${MK_LUA} != "no"
+BOOT_LUA=	yes
+LIBLUA=		${.OBJDIR}/../../liblua/liblua.a
+.endif
+
 .if defined(LOADER_BZIP2_SUPPORT)
 CFLAGS+=	-DLOADER_BZIP2_SUPPORT
 .endif
@@ -124,8 +129,10 @@ FILES+= menu.rc
 # XXX crt0.o needs to be first for pxeboot(8) to work
 OBJS=	${BTXCRT}
 
-DPADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
-LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
+DPADD=	${LIBFICL} ${LIBLUA} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} \
+	${LIBSTAND}
+LDADD=	${LIBFICL} ${LIBLUA} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} \
+	${LIBSTAND}
 
 .include <bsd.prog.mk>
 


More information about the svn-src-projects mailing list