diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2022-04-12 16:42:59 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2022-04-12 16:42:59 -0300 |
commit | 17b51d22ab887ee76662ca7565239f214f1ade05 (patch) | |
tree | 991996c8d208087857eefd968c0c8c740b899ed2 | |
parent | a208f73967ad45c498c57e31ca27d29a48c10603 (diff) | |
download | luarocks-17b51d22ab887ee76662ca7565239f214f1ade05.tar.gz luarocks-17b51d22ab887ee76662ca7565239f214f1ade05.tar.bz2 luarocks-17b51d22ab887ee76662ca7565239f214f1ade05.zip |
macos: add best-effort library search for Homebrew
-rw-r--r-- | src/luarocks/core/cfg.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index 043707f5..c5c2e005 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua | |||
@@ -481,10 +481,18 @@ local function make_defaults(lua_version, target_cpu, platforms, home) | |||
481 | defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" | 481 | defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" |
482 | defaults.web_browser = "open" | 482 | defaults.web_browser = "open" |
483 | 483 | ||
484 | -- XCode SDK | ||
484 | local sdk_path = util.popen_read("xcrun --show-sdk-path 2>/dev/null") | 485 | local sdk_path = util.popen_read("xcrun --show-sdk-path 2>/dev/null") |
485 | if sdk_path then | 486 | if sdk_path then |
486 | table.insert(defaults.external_deps_dirs, sdk_path .. "/usr") | 487 | table.insert(defaults.external_deps_dirs, sdk_path .. "/usr") |
487 | end | 488 | end |
489 | |||
490 | -- Homebrew | ||
491 | table.insert(defaults.external_deps_dirs, "/usr/local/opt") | ||
492 | defaults.external_deps_subdirs.lib = { "", "lib", } | ||
493 | defaults.runtime_external_deps_subdirs.lib = { "", "lib", } | ||
494 | table.insert(defaults.external_deps_patterns.lib, 1, "/?/lib/lib?.dylib") | ||
495 | table.insert(defaults.runtime_external_deps_patterns.lib, 1, "/?/lib/lib?.dylib") | ||
488 | end | 496 | end |
489 | 497 | ||
490 | if platforms.linux then | 498 | if platforms.linux then |