aboutsummaryrefslogtreecommitdiff
path: root/binary
diff options
context:
space:
mode:
Diffstat (limited to 'binary')
-rw-r--r--binary/Makefile.windows2
-rwxr-xr-xbinary/all_in_one2
2 files changed, 2 insertions, 2 deletions
diff --git a/binary/Makefile.windows b/binary/Makefile.windows
index a8644078..b2094728 100644
--- a/binary/Makefile.windows
+++ b/binary/Makefile.windows
@@ -16,7 +16,7 @@ BUILD_WINDOWS_DEPS_DIR=build-windows-deps-$(MINGW_PREFIX)
16BUILD_WINDOWS_BINARY_DIR=build-windows-binary-$(MINGW_PREFIX) 16BUILD_WINDOWS_BINARY_DIR=build-windows-binary-$(MINGW_PREFIX)
17 17
18# windows-binary: $(WINDOWS_DEPS_DIR)/lib/liblua.a $(WINDOWS_DEPS_DIR)/lib/libssl.a $(WINDOWS_DEPS_DIR)/lib/libz.a $(WINDOWS_DEPS_DIR)/lib/libbz2.a 18# windows-binary: $(WINDOWS_DEPS_DIR)/lib/liblua.a $(WINDOWS_DEPS_DIR)/lib/libssl.a $(WINDOWS_DEPS_DIR)/lib/libz.a $(WINDOWS_DEPS_DIR)/lib/libbz2.a
19windows-binary: 19windows-binary: $(WINDOWS_DEPS_DIR)/lib/liblua.a
20 STATIC_GCC_AR=$(MINGW_PREFIX)-ar \ 20 STATIC_GCC_AR=$(MINGW_PREFIX)-ar \
21 STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ 21 STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \
22 STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ 22 STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \
diff --git a/binary/all_in_one b/binary/all_in_one
index a0a157af..02a54c8e 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -510,7 +510,7 @@ print("==============================================")
510 print("----------------------------------------------------------------") 510 print("----------------------------------------------------------------")
511 local vers = manif.get_versions(queries.from_dep_string(name), "one") 511 local vers = manif.get_versions(queries.from_dep_string(name), "one")
512 if not next(vers) then 512 if not next(vers) then
513 local command = "LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install --no-project '--tree=" .. LUA_MODULES .. "' --lua-dir=" .. LUA_DIR .. " " .. use 513 local command = "LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install --no-project '--tree=" .. LUA_MODULES .. "' " .. use
514 print(command) 514 print(command)
515 local ok = os.execute(command) 515 local ok = os.execute(command)
516 if ok ~= 0 and ok ~= true then 516 if ok ~= 0 and ok ~= true then