From 0e07112d84f63ff4a4e303524b77a36fba619ad4 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Sun, 5 Aug 2018 15:38:37 +1000 Subject: Remove BINARY_ prefix from CC and NM --- GNUmakefile | 4 ++-- binary/Makefile.windows | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index eb7d82fe..23ab0fee 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -120,12 +120,12 @@ binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe build-binary/luarocks.exe: luarocks (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)) + "$(LUA)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) build-binary/luarocks-admin.exe: luarocks (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)) + "$(LUA)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) # ---------------------------------------- # Binary install diff --git a/binary/Makefile.windows b/binary/Makefile.windows index a8754030..33ae8297 100644 --- a/binary/Makefile.windows +++ b/binary/Makefile.windows @@ -16,7 +16,7 @@ windows-binary: windows-deps/lib/liblua.a windows-deps/lib/libssl.a windows-deps STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ LUAROCKS_CROSS_COMPILING=1 \ - make binary LUA_DIR=$(CURDIR)/windows-deps BINARY_CC=$(MINGW_PREFIX)-gcc BINARY_NM=$(MINGW_PREFIX)-nm BINARY_PLATFORM=windows BINARY_TARGET=build-windows-binary BINARY_SYSROOT=$(MINGW_SYSROOT) + make binary LUA_DIR=$(CURDIR)/windows-deps CC=$(MINGW_PREFIX)-gcc NM=$(MINGW_PREFIX)-nm BINARY_PLATFORM=windows BINARY_TARGET=build-windows-binary BINARY_SYSROOT=$(MINGW_SYSROOT) build-windows-deps/lua-$(LIBLUA_VERSION).tar.gz: mkdir -p build-windows-deps -- cgit v1.2.3-55-g6feb