Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at release-19.03 27 lines 1.2 kB view raw
1diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua 2index 55cd4c9..060a6f1 100644 3--- a/src/luarocks/cfg.lua 4+++ b/src/luarocks/cfg.lua 5@@ -587,9 +587,9 @@ if cfg.platforms.macosx then 6 defaults.external_lib_extension = "dylib" 7 defaults.arch = "macosx-"..cfg.target_cpu 8 defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" 9- defaults.variables.STAT = "/usr/bin/stat" 10+ defaults.variables.STAT = "stat" 11 defaults.variables.STATFLAG = "-f '%A'" 12- local version = io.popen("sw_vers -productVersion"):read("*l") 13+ local version = "10.10" 14 version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 15 if version >= 10 then 16 version = 8 17@@ -598,8 +598,8 @@ if cfg.platforms.macosx then 18 else 19 defaults.gcc_rpath = false 20 end 21- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" 22- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" 23+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang" 24+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang" 25 defaults.web_browser = "open" 26 end 27