From 59354e07c63c171d8f67d40e4c1daa94d552f248 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Sun, 5 Aug 2018 15:30:12 +1000 Subject: GNUmakefile: Have build-binary targets use clean lua environment --- GNUmakefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index ba975b99..eb7d82fe 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -118,10 +118,14 @@ uninstall: binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe build-binary/luarocks.exe: luarocks - LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" build-binary $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT) + (unset $(LUA_ENV_VARS); \ + LUA_PATH="./src/?.lua;;" \ + "$(LUA)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)) build-binary/luarocks-admin.exe: luarocks - LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" build-binary $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT) + (unset $(LUA_ENV_VARS); \ + LUA_PATH="./src/?.lua;;" \ + "$(LUA)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)) # ---------------------------------------- # Binary install -- cgit v1.2.3-55-g6feb