aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2013-08-22 13:34:59 -0300
committerHisham Muhammad <hisham@gobolinux.org>2013-08-22 13:34:59 -0300
commitc4805428af0e5862bf340c5010f41ae04fed1ae4 (patch)
tree2ffed3d07efbe0f392716795077d7b474f681d25
parent86ad43102751fd690d89c6a71cae4da848a2e4f5 (diff)
downloadluarocks-c4805428af0e5862bf340c5010f41ae04fed1ae4.tar.gz
luarocks-c4805428af0e5862bf340c5010f41ae04fed1ae4.tar.bz2
luarocks-c4805428af0e5862bf340c5010f41ae04fed1ae4.zip
Use list from http://stackoverflow.com/a/15853231/1793220 when detecting mingw libraries.
Closes #139.
-rw-r--r--src/luarocks/cfg.lua13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 5d918b13..9508ce88 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -316,6 +316,19 @@ if detected.mingw32 then
316 defaults.variables.LD = "mingw32-gcc" 316 defaults.variables.LD = "mingw32-gcc"
317 defaults.variables.CFLAGS = "-O2" 317 defaults.variables.CFLAGS = "-O2"
318 defaults.variables.LIBFLAG = "-shared" 318 defaults.variables.LIBFLAG = "-shared"
319 defaults.external_deps_patterns = {
320 bin = { "?.exe", "?.bat" },
321 -- mingw lookup list from http://stackoverflow.com/a/15853231/1793220
322 -- ...should we keep ?.lib at the end? It's not in the above list.
323 lib = { "lib?.dll.a", "?.dll.a", "lib?.a", "cyg?.dll", "lib?.dll", "?.dll", "?.lib" },
324 include = { "?.h" }
325 }
326 defaults.runtime_external_deps_patterns = {
327 bin = { "?.exe", "?.bat" },
328 lib = { "cyg?.dll", "?.dll", "lib?.dll" },
329 include = { "?.h" }
330 }
331
319end 332end
320 333
321if detected.unix then 334if detected.unix then