Index: head/stand/liblua/Makefile
===================================================================
--- head/stand/liblua/Makefile	(revision 329856)
+++ head/stand/liblua/Makefile	(revision 329857)
@@ -1,38 +1,39 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:		${LUASRC}
 .PATH:		${LIBLUASRC}
 
+.include	"${BOOTSRC}/lua.mk"
+
 LIB=		lua
 INTERNALLIB=
 
 # Core Lua.
 SRCS=	lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c \
 	lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c \
         ltm.c lundump.c lvm.c lzio.c
 SRCS+=	lauxlib.c lbaselib.c lstrlib.c loadlib.c
 
 # These aren't yet included, but link now, omitting them saves 15k
 #SRCS+=	lcorolib.c ldblib.c lutf8lib.c
 
 # These aren't yet compatible with the boot environment, and some may never be
 #SRCS+=	lbitlib.c liolib.c lmathlib.c loslib.c ltablib.c
 
 # Our utilities.
 SRCS+=	lerrno.c lfs.c lstd.c lutils.c
 
 WARNS=	3
 
-CFLAGS+= -DLUA_FLOAT_TYPE=LUA_FLOAT_INT64
 CFLAGS+= -DLUA_PATH_DEFAULT=\"/boot/lua/\?.lua\"
-CFLAGS+= -ffreestanding -nostdlib -DBOOT_LUA -DLUA_USE_POSIX
+CFLAGS+= -ffreestanding -nostdlib -DLUA_USE_POSIX
 CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE
 CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC}
 
 .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0
 CFLAGS+=	-fPIC
 .endif
 
 .include <bsd.lib.mk>
Index: head/stand/lua.mk
===================================================================
--- head/stand/lua.mk	(revision 329856)
+++ head/stand/lua.mk	(revision 329857)
@@ -1,12 +1,7 @@
 # $FreeBSD$
 
 # Common flags to build lua related files
 
-.include "defs.mk"
-
-.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0
-CFLAGS+=	-fPIC
-.endif
-
 CFLAGS+=	-I${LUASRC} -I${LDRSRC} -I${LIBLUASRC}
-CFLAGS+=	-DBOOT_LUA
+# CFLAGS+=	-Ddouble=jagged-little-pill -Dfloat=poison-shake -D__OMIT_FLOAT
+CFLAGS+=	-DLUA_FLOAT_TYPE=LUA_FLOAT_INT64