Date: Wed, 25 Mar 2015 06:04:40 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280486 - projects/lua-bootloader/sys/boot/i386/loader Message-ID: <201503250604.t2P64elr057366@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503250604.t2P64elr057366>