diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-09-30 19:02:09 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-09-30 19:02:09 -0300 |
| commit | bacd3da5b1406d327dd4009b7ec3ea1834117534 (patch) | |
| tree | d0b9d07e742ac4cf60f7debe50fa1cc7c89f26db /src | |
| parent | e3203adbc3f5daa5f46097d3439edbada01807f3 (diff) | |
| download | luarocks-bacd3da5b1406d327dd4009b7ec3ea1834117534.tar.gz luarocks-bacd3da5b1406d327dd4009b7ec3ea1834117534.tar.bz2 luarocks-bacd3da5b1406d327dd4009b7ec3ea1834117534.zip | |
Use env for setting MACOSX_DEPLOYMENT_TARGET.
See #422.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/bin/luarocks | 3 | ||||
| -rwxr-xr-x | src/bin/luarocks-admin | 3 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | #!/usr/bin/env lua | 1 | #!/Programs/Lua/5.1.5/bin/lua |
| 2 | package.path = [[/Users/hisham/luarocks/prefix-5.1/share/lua/5.1/?.lua;]]..package.path | ||
| 2 | 3 | ||
| 3 | -- this should be loaded first. | 4 | -- this should be loaded first. |
| 4 | local cfg = require("luarocks.cfg") | 5 | 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 @@ | |||
| 1 | #!/usr/bin/env lua | 1 | #!/Programs/Lua/5.1.5/bin/lua |
| 2 | package.path = [[/Users/hisham/luarocks/prefix-5.1/share/lua/5.1/?.lua;]]..package.path | ||
| 2 | 3 | ||
| 3 | -- this should be loaded first. | 4 | -- this should be loaded first. |
| 4 | local cfg = require("luarocks.cfg") | 5 | 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 | |||
| 523 | else | 523 | else |
| 524 | defaults.gcc_rpath = false | 524 | defaults.gcc_rpath = false |
| 525 | end | 525 | end |
| 526 | defaults.variables.CC = "export MACOSX_DEPLOYMENT_TARGET=10."..version.."; gcc" | 526 | defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" |
| 527 | defaults.variables.LD = "export MACOSX_DEPLOYMENT_TARGET=10."..version.."; gcc" | 527 | defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" |
| 528 | defaults.web_browser = "open" | 528 | defaults.web_browser = "open" |
| 529 | end | 529 | end |
| 530 | 530 | ||
