diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-11 00:16:43 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-11 00:34:18 -0300 |
commit | 958d431a09b2ad0a5137695488692a14c9e533d6 (patch) | |
tree | ed36959b667e9ac26828023d08f42068f7da5d0b /binary | |
parent | bd640437b240796b0aae7ce168041afd206c5d9b (diff) | |
download | luarocks-958d431a09b2ad0a5137695488692a14c9e533d6.tar.gz luarocks-958d431a09b2ad0a5137695488692a14c9e533d6.tar.bz2 luarocks-958d431a09b2ad0a5137695488692a14c9e533d6.zip |
Honor --force-config
Diffstat (limited to 'binary')
-rwxr-xr-x | binary/all_in_one | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/binary/all_in_one b/binary/all_in_one index d6517d79..01758758 100755 --- a/binary/all_in_one +++ b/binary/all_in_one | |||
@@ -30,10 +30,11 @@ 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 "build-binary" | 32 | local TARGET = arg[5] or "build-binary" |
33 | local MY_PLATFORM = arg[6] or "unix" | 33 | local FORCE_CONFIG = (arg[6] == "yes") |
34 | local CC = arg[7] or "gcc" | 34 | local MY_PLATFORM = arg[7] or "unix" |
35 | local NM = arg[8] or "nm" | 35 | local CC = arg[8] or "gcc" |
36 | local CROSSCOMPILER_SYSROOT = arg[9] or "/usr/lib/mingw-w64-sysroot/i686-w64-mingw32" | 36 | local NM = arg[9] or "nm" |
37 | local CROSSCOMPILER_SYSROOT = arg[10] or "/usr/lib/mingw-w64-sysroot/i686-w64-mingw32" | ||
37 | 38 | ||
38 | local LUA_MODULES = TARGET .. "/lua_modules" | 39 | local LUA_MODULES = TARGET .. "/lua_modules" |
39 | local CONFIG_DIR = TARGET .. "/.luarocks" | 40 | local CONFIG_DIR = TARGET .. "/.luarocks" |
@@ -158,6 +159,7 @@ local function write_hardcoded_module(dir) | |||
158 | local hardcoded = { | 159 | local hardcoded = { |
159 | SYSTEM = system, | 160 | SYSTEM = system, |
160 | PROCESSOR = processor, | 161 | PROCESSOR = processor, |
162 | FORCE_CONFIG = FORCE_CONFIG, | ||
161 | 163 | ||
162 | SYSCONFDIR = if_platform("unix", SYSCONFDIR), | 164 | SYSCONFDIR = if_platform("unix", SYSCONFDIR), |
163 | 165 | ||