aboutsummaryrefslogtreecommitdiff
path: root/binary
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2019-04-17 11:37:51 -0300
committerHisham Muhammad <hisham@gobolinux.org>2019-04-17 11:37:51 -0300
commite70441f70ab49f4f98b4c6530fca50e207554b2b (patch)
treeb91c1bb97644e0b9923ac79c7825c0c591159353 /binary
parent67660acf200e45855084c9750bec4c122bbf8cae (diff)
downloadluarocks-e70441f70ab49f4f98b4c6530fca50e207554b2b.tar.gz
luarocks-e70441f70ab49f4f98b4c6530fca50e207554b2b.tar.bz2
luarocks-e70441f70ab49f4f98b4c6530fca50e207554b2b.zip
hardcode "windows" platform in Windows binary to help Wine
platform autodetection at runtime is apparently failing on Wine, but we don't really need it when using `luarocks.exe`. Fixes #996.
Diffstat (limited to 'binary')
-rwxr-xr-xbinary/all_in_one7
1 files changed, 3 insertions, 4 deletions
diff --git a/binary/all_in_one b/binary/all_in_one
index 43a18a3b..d38fe706 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -45,7 +45,6 @@ local fs = require("luarocks.fs")
45local cfg = require("luarocks.core.cfg") 45local cfg = require("luarocks.core.cfg")
46local cmd = require("luarocks.cmd") 46local cmd = require("luarocks.cmd")
47local deps = require("luarocks.deps") 47local deps = require("luarocks.deps")
48local util = require("luarocks.util")
49local path = require("luarocks.path") 48local path = require("luarocks.path")
50local manif = require("luarocks.manif") 49local manif = require("luarocks.manif")
51local queries = require("luarocks.queries") 50local queries = require("luarocks.queries")
@@ -141,11 +140,11 @@ end
141 140
142local function write_hardcoded_module(dir) 141local function write_hardcoded_module(dir)
143 142
144 local system 143 local system, processor
145 local processor = if_platform("windows", "x86")
146
147 if if_platform("unix", true) then 144 if if_platform("unix", true) then
148 system, processor = sysdetect.detect() 145 system, processor = sysdetect.detect()
146 else
147 system, processor = "windows", "x86"
149 end 148 end
150 149
151 local hardcoded = { 150 local hardcoded = {