diff options
| author | Karel Tuma <kat@lua.cz> | 2016-02-23 19:02:47 +0100 |
|---|---|---|
| committer | Karel Tuma <kat@lua.cz> | 2016-02-23 19:05:38 +0100 |
| commit | 436e58ccf28628768b74d7306ab1b1756a9dbf98 (patch) | |
| tree | eed360297fa513a4b1752b1e952e2dbeacadc2b2 | |
| parent | 6ceda9d3bccd2fd4a1ad90846a6a982a671c26b1 (diff) | |
| download | luarocks-436e58ccf28628768b74d7306ab1b1756a9dbf98.tar.gz luarocks-436e58ccf28628768b74d7306ab1b1756a9dbf98.tar.bz2 luarocks-436e58ccf28628768b74d7306ab1b1756a9dbf98.zip | |
Implement MSYS2 support
| -rw-r--r-- | src/luarocks/cfg.lua | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index e41b632c..2924e435 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
| @@ -113,6 +113,10 @@ elseif system == "SunOS" then | |||
| 113 | elseif system and system:match("^CYGWIN") then | 113 | elseif system and system:match("^CYGWIN") then |
| 114 | cfg.platforms.unix = true | 114 | cfg.platforms.unix = true |
| 115 | cfg.platforms.cygwin = true | 115 | cfg.platforms.cygwin = true |
| 116 | elseif system and system:match("^MSYS") then | ||
| 117 | cfg.platforms.unix = true | ||
| 118 | cfg.platforms.msys = true | ||
| 119 | cfg.platforms.cygwin = true | ||
| 116 | elseif system and system:match("^Windows") then | 120 | elseif system and system:match("^Windows") then |
| 117 | cfg.platforms.windows = true | 121 | cfg.platforms.windows = true |
| 118 | cfg.platforms.win32 = true | 122 | cfg.platforms.win32 = true |
| @@ -137,10 +141,11 @@ local platform_order = { | |||
| 137 | linux = 7, | 141 | linux = 7, |
| 138 | macosx = 8, | 142 | macosx = 8, |
| 139 | cygwin = 9, | 143 | cygwin = 9, |
| 144 | msys = 10, | ||
| 140 | -- Windows | 145 | -- Windows |
| 141 | win32 = 10, | 146 | win32 = 11, |
| 142 | mingw32 = 11, | 147 | mingw32 = 12, |
| 143 | windows = 12 } | 148 | windows = 13 } |
| 144 | 149 | ||
| 145 | 150 | ||
| 146 | -- Path configuration: | 151 | -- Path configuration: |
| @@ -518,6 +523,23 @@ if cfg.platforms.cygwin then | |||
| 518 | defaults.variables.LIBFLAG = "-shared" | 523 | defaults.variables.LIBFLAG = "-shared" |
| 519 | end | 524 | end |
| 520 | 525 | ||
| 526 | if cfg.platforms.msys then | ||
| 527 | -- msys is basically cygwin made out of mingw, meaning the subsytem is unixish | ||
| 528 | -- enough, yet we can freely mix with native win32 | ||
| 529 | defaults.external_deps_patterns = { | ||
| 530 | bin = { "?.exe", "?.bat", "?" }, | ||
| 531 | lib = { "lib?.so", "lib?.so.*", "lib?.dll.a", "?.dll.a", | ||
| 532 | "lib?.a", "lib?.dll", "?.dll", "?.lib" }, | ||
| 533 | include = { "?.h" } | ||
| 534 | } | ||
| 535 | defaults.runtime_external_deps_patterns = { | ||
| 536 | bin = { "?.exe", "?.bat" }, | ||
| 537 | lib = { "lib?.so", "?.dll", "lib?.dll" }, | ||
| 538 | include = { "?.h" } | ||
| 539 | } | ||
| 540 | end | ||
| 541 | |||
| 542 | |||
| 521 | if cfg.platforms.bsd then | 543 | if cfg.platforms.bsd then |
| 522 | defaults.variables.MAKE = "gmake" | 544 | defaults.variables.MAKE = "gmake" |
| 523 | defaults.variables.STATFLAG = "-f '%OLp'" | 545 | defaults.variables.STATFLAG = "-f '%OLp'" |
