From b5926be6dd3438c7f98afe7c9ffb28f52fb6a573 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 10 Aug 2018 17:34:31 -0300 Subject: Build Windows binaries as .exe in a separate directory --- binary/Makefile.windows | 2 +- binary/all_in_one | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'binary') 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 STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ LUAROCKS_CROSS_COMPILING=1 \ - $(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) + $(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) build-windows-deps/lua-$(LIBLUA_VERSION).tar.gz: 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" local LUA_DIR = arg[2] or "/usr" local EXCLUDE = arg[3] or "^src/luarocks/admin/" local SYSCONFDIR = arg[4] or "/etc/luarocks" -local TARGET = arg[5] or "binary-build" +local TARGET = arg[5] or "build-binary" local MY_PLATFORM = arg[6] or "unix" local CC = arg[7] or "gcc" local NM = arg[8] or "nm" -- cgit v1.2.3-55-g6feb