Index: stable/12/libexec/flua/Makefile
===================================================================
--- stable/12/libexec/flua/Makefile	(revision 359645)
+++ stable/12/libexec/flua/Makefile	(revision 359646)
@@ -1,38 +1,46 @@
 #! $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=	m
 
 # Core functions
 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
 
 # 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
 
 # Entry point
 SRCS+=	lua.c
 
 # FreeBSD Extensions
 .PATH: ${.CURDIR}/modules
 SRCS+=	linit_flua.c
 SRCS+=	lfs.c lposix.c
 
 CFLAGS+=	-I${.CURDIR} -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
+.endif
+
 .include <bsd.prog.mk>
Index: stable/12
===================================================================
--- stable/12	(revision 359645)
+++ stable/12	(revision 359646)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r359453,359455