diff options
-rw-r--r-- | GNUmakefile | 4 | ||||
-rw-r--r-- | 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 | |||
120 | build-binary/luarocks.exe: luarocks | 120 | build-binary/luarocks.exe: luarocks |
121 | (unset $(LUA_ENV_VARS); \ | 121 | (unset $(LUA_ENV_VARS); \ |
122 | LUA_PATH="./src/?.lua;;" \ | 122 | LUA_PATH="./src/?.lua;;" \ |
123 | "$(LUA)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)) | 123 | "$(LUA)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) |
124 | 124 | ||
125 | build-binary/luarocks-admin.exe: luarocks | 125 | build-binary/luarocks-admin.exe: luarocks |
126 | (unset $(LUA_ENV_VARS); \ | 126 | (unset $(LUA_ENV_VARS); \ |
127 | LUA_PATH="./src/?.lua;;" \ | 127 | LUA_PATH="./src/?.lua;;" \ |
128 | "$(LUA)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)) | 128 | "$(LUA)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) |
129 | 129 | ||
130 | # ---------------------------------------- | 130 | # ---------------------------------------- |
131 | # Binary install | 131 | # 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 | |||
16 | STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ | 16 | STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ |
17 | STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ | 17 | STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ |
18 | LUAROCKS_CROSS_COMPILING=1 \ | 18 | LUAROCKS_CROSS_COMPILING=1 \ |
19 | 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) | 19 | 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) |
20 | 20 | ||
21 | build-windows-deps/lua-$(LIBLUA_VERSION).tar.gz: | 21 | build-windows-deps/lua-$(LIBLUA_VERSION).tar.gz: |
22 | mkdir -p build-windows-deps | 22 | mkdir -p build-windows-deps |