From c4558a3bfdd59d58f24fc756667cf482ece83e6a Mon Sep 17 00:00:00 2001 From: Jay Vaughan Date: Fri, 5 Dec 2014 14:45:49 +0100 Subject: OSX 10.10 Yosemite sw_vers update --- src/luarocks/cfg.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 2d02230b..8f7cab1b 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -445,8 +445,8 @@ if detected.macosx then defaults.variables.STATFLAG = "-f '%A'" local version = io.popen("sw_vers -productVersion"):read("*l") version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 - if version >= 5 then - version = 5 + if version >= 10 then + version = 10 else defaults.gcc_rpath = false end -- cgit v1.2.3-55-g6feb From 02e8bbde0a21e07d76ed7cd15e4c01ce86d22344 Mon Sep 17 00:00:00 2001 From: Jay Vaughan Date: Tue, 9 Dec 2014 11:23:11 +0100 Subject: Safer guards for OSX Deployment target selection.. --- src/luarocks/cfg.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 8f7cab1b..09640ca2 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -446,7 +446,9 @@ if detected.macosx then local version = io.popen("sw_vers -productVersion"):read("*l") version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then - version = 10 + version = 8 + elseif version >= 5 then + version = 5 else defaults.gcc_rpath = false end -- cgit v1.2.3-55-g6feb