Index: head/lib/liblua/Makefile
===================================================================
--- head/lib/liblua/Makefile	(revision 364226)
+++ head/lib/liblua/Makefile	(revision 364227)
@@ -1,34 +1,36 @@
 #! $FreeBSD$
 
 LUASRC?=	${SRCTOP}/contrib/lua/src
 .PATH: ${LUASRC}
 
 LIB=	lua
 INTERNALLIB=
 WARNS?=	2
 MAN=	# No manpage; this is internal.
 
 CWARNFLAGS.gcc+=	-Wno-format-nonliteral
 
 LIBADD=	m
 
 # Core functions
 SRCS=	lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.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
 
 # Library functions; any change to these likely needs an accompanying change
 # in our custom linit_flua.c.  We use our custom linit.c to make it easier to
 # support bootstrap flua that may not have supporting local libraries.
 SRCS+=	lauxlib.c lbaselib.c lbitlib.c lcorolib.c ldblib.c liolib.c \
 	lmathlib.c loslib.c lstrlib.c ltablib.c lutf8lib.c loadlib.c
 
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/modules -I${LUASRC}
 CFLAGS+=	-DLUA_PROGNAME="\"${PROG}\""
 
 .if defined(BOOTSTRAPPING)
 CFLAGS+=	-DLUA_PATH_DEFAULT="\"/nonexistent/?.lua\""
 CFLAGS+=	-DLUA_CPATH_DEFAULT="\"/nonexistent/?.so\""
+# We don't support dynamic libs on bootstrap builds.
+CFLAGS+=	-DBOOTSTRAPPING
 .endif
 
 .include <bsd.lib.mk>
Index: head/libexec/flua/Makefile
===================================================================
--- head/libexec/flua/Makefile	(revision 364226)
+++ head/libexec/flua/Makefile	(revision 364227)
@@ -1,45 +1,42 @@
 #! $FreeBSD$
 
 .include <src.lua.mk>
 
 LUASRC?=	${SRCTOP}/contrib/lua/src
 .PATH: ${LUASRC}
 
 PROG=	flua
 WARNS?=	2
 MAN=	# No manpage; this is internal.
 
 CWARNFLAGS.gcc+=	-Wno-format-nonliteral
 
 LIBADD=	lua
 
 # Entry point
 SRCS+=	lua.c
 
 # FreeBSD Extensions
 .PATH: ${.CURDIR}/modules
 SRCS+=	linit_flua.c
 SRCS+=	lfs.c lposix.c
 
 CFLAGS+=	-I${SRCTOP}/lib/liblua -I${.CURDIR}/modules -I${LUASRC}
 CFLAGS+=	-DLUA_PROGNAME="\"${PROG}\""
 
 # readline bits; these aren't needed if we're building a bootstrap flua, as we
 # don't expect that one to see any REPL usage.
 .if !defined(BOOTSTRAPPING)
 CFLAGS+=	-DLUA_USE_READLINE
 CFLAGS+=	-I${SRCTOP}/lib/libedit -I${SRCTOP}/contrib/libedit
 LIBADD+=	edit
 LDFLAGS+=	-Wl,-E
-.else
-# We don't support dynamic libs on bootstrap builds.
-CFLAGS+=	-DBOOTSTRAPPING
 .endif
 
 UCLSRC?=	${SRCTOP}/contrib/libucl
 .PATH: ${UCLSRC}/lua
 SRCS+=	lua_ucl.c
 CFLAGS+=	-I${UCLSRC}/include -I${UCLSRC}/src -I${UCLSRC}/uthash
 LIBADD+=	ucl
 
 .include <bsd.prog.mk>