diff options
Diffstat (limited to 'binary')
| -rw-r--r-- | binary/Makefile.windows | 2 | ||||
| -rwxr-xr-x | binary/all_in_one | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/binary/Makefile.windows b/binary/Makefile.windows index e7a5ea3b..e7bcca27 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 CC=$(MINGW_PREFIX)-gcc 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 buildbinarydir=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 $(@D) | 22 | mkdir -p $(@D) |
diff --git a/binary/all_in_one b/binary/all_in_one index f1c2e0a1..d6517d79 100755 --- a/binary/all_in_one +++ b/binary/all_in_one | |||
| @@ -29,7 +29,7 @@ local MAIN_PROGRAM = arg[1] or "src/bin/luarocks" | |||
| 29 | local LUA_DIR = arg[2] or "/usr" | 29 | local LUA_DIR = arg[2] or "/usr" |
| 30 | local EXCLUDE = arg[3] or "^src/luarocks/admin/" | 30 | local EXCLUDE = arg[3] or "^src/luarocks/admin/" |
| 31 | local SYSCONFDIR = arg[4] or "/etc/luarocks" | 31 | local SYSCONFDIR = arg[4] or "/etc/luarocks" |
| 32 | local TARGET = arg[5] or "binary-build" | 32 | local TARGET = arg[5] or "build-binary" |
| 33 | local MY_PLATFORM = arg[6] or "unix" | 33 | local MY_PLATFORM = arg[6] or "unix" |
| 34 | local CC = arg[7] or "gcc" | 34 | local CC = arg[7] or "gcc" |
| 35 | local NM = arg[8] or "nm" | 35 | local NM = arg[8] or "nm" |
