diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-01-15 20:41:11 -0200 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-01-15 20:41:11 -0200 |
| commit | aa4e0d3cfc680789bf6c481dbafa7df49896470f (patch) | |
| tree | c8224819e9035ae1d68ba09a5035964afa94168f | |
| parent | 9702239587aa24b3cfe3bd5f81e3a6a4f5450723 (diff) | |
| parent | 02e8bbde0a21e07d76ed7cd15e4c01ce86d22344 (diff) | |
| download | luarocks-aa4e0d3cfc680789bf6c481dbafa7df49896470f.tar.gz luarocks-aa4e0d3cfc680789bf6c481dbafa7df49896470f.tar.bz2 luarocks-aa4e0d3cfc680789bf6c481dbafa7df49896470f.zip | |
Merge pull request #298 from seclorum/master
OSX 10.10 Yosemite sw_vers update
| -rw-r--r-- | src/luarocks/cfg.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 32ab1f37..25bd1553 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
| @@ -448,8 +448,10 @@ if detected.macosx then | |||
| 448 | defaults.variables.STATFLAG = "-f '%A'" | 448 | defaults.variables.STATFLAG = "-f '%A'" |
| 449 | local version = io.popen("sw_vers -productVersion"):read("*l") | 449 | local version = io.popen("sw_vers -productVersion"):read("*l") |
| 450 | version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 | 450 | version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 |
| 451 | if version >= 5 then | 451 | if version >= 10 then |
| 452 | version = 5 | 452 | version = 8 |
| 453 | elseif version >= 5 then | ||
| 454 | version = 5 | ||
| 453 | else | 455 | else |
| 454 | defaults.gcc_rpath = false | 456 | defaults.gcc_rpath = false |
| 455 | end | 457 | end |