From bacd3da5b1406d327dd4009b7ec3ea1834117534 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 30 Sep 2015 19:02:09 -0300 Subject: Use env for setting MACOSX_DEPLOYMENT_TARGET. See #422. --- src/bin/luarocks | 3 ++- src/bin/luarocks-admin | 3 ++- src/luarocks/cfg.lua | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/luarocks b/src/bin/luarocks index be6c2b81..8ade7a3d 100755 --- a/src/bin/luarocks +++ b/src/bin/luarocks @@ -1,4 +1,5 @@ -#!/usr/bin/env lua +#!/Programs/Lua/5.1.5/bin/lua +package.path = [[/Users/hisham/luarocks/prefix-5.1/share/lua/5.1/?.lua;]]..package.path -- this should be loaded first. local cfg = require("luarocks.cfg") diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin index 2890d1f1..bb1be40a 100755 --- a/src/bin/luarocks-admin +++ b/src/bin/luarocks-admin @@ -1,4 +1,5 @@ -#!/usr/bin/env lua +#!/Programs/Lua/5.1.5/bin/lua +package.path = [[/Users/hisham/luarocks/prefix-5.1/share/lua/5.1/?.lua;]]..package.path -- this should be loaded first. local cfg = require("luarocks.cfg") diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 1b4923ab..3b7f9c37 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -523,8 +523,8 @@ if cfg.platforms.macosx then else defaults.gcc_rpath = false end - defaults.variables.CC = "export MACOSX_DEPLOYMENT_TARGET=10."..version.."; gcc" - defaults.variables.LD = "export MACOSX_DEPLOYMENT_TARGET=10."..version.."; gcc" + defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" + defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" defaults.web_browser = "open" end -- cgit v1.2.3-55-g6feb From 8fe1bbd627bae2da2d1b7d8e376a35ebf5626d2e Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 30 Sep 2015 21:50:52 -0300 Subject: Revert accidental commit. --- src/bin/luarocks | 3 +-- src/bin/luarocks-admin | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bin/luarocks b/src/bin/luarocks index 8ade7a3d..be6c2b81 100755 --- a/src/bin/luarocks +++ b/src/bin/luarocks @@ -1,5 +1,4 @@ -#!/Programs/Lua/5.1.5/bin/lua -package.path = [[/Users/hisham/luarocks/prefix-5.1/share/lua/5.1/?.lua;]]..package.path +#!/usr/bin/env lua -- this should be loaded first. local cfg = require("luarocks.cfg") diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin index bb1be40a..2890d1f1 100755 --- a/src/bin/luarocks-admin +++ b/src/bin/luarocks-admin @@ -1,5 +1,4 @@ -#!/Programs/Lua/5.1.5/bin/lua -package.path = [[/Users/hisham/luarocks/prefix-5.1/share/lua/5.1/?.lua;]]..package.path +#!/usr/bin/env lua -- this should be loaded first. local cfg = require("luarocks.cfg") -- cgit v1.2.3-55-g6feb