From 967fbfd9e2b7a015d5cba1491badcdf9044b28b9 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Fri, 14 Aug 2020 02:40:17 +0000 Subject: [PATCH] Properly disable LUA_USE_DLOPEN for bootstrap flua flua does have some specific bits that will include luaconf.h, but the definition of LUA_USE_DLOPEN for those won't matter. This belongs in liblua instead. To expand on my previous commit, which was a little sparse with details, it's not really safe to allow LUA_USE_DLOPEN with host lib paths being used. The host system could have an entirely different lua version and this could cause us to crash and burn. If we want to revive this later, we need to make sure to define c module paths inside OBJDIR that are compiled against whatever version we've bootstrapped. Pointy hat: kevans --- lib/liblua/Makefile | 2 ++ libexec/flua/Makefile | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/liblua/Makefile b/lib/liblua/Makefile index 28fc05a9aa71..e5f5e3c5960a 100644 --- a/lib/liblua/Makefile +++ b/lib/liblua/Makefile @@ -29,6 +29,8 @@ 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 diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index c852bd4fe499..cfa1f2460f5f 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -31,9 +31,6 @@ 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