From 17b51d22ab887ee76662ca7565239f214f1ade05 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 12 Apr 2022 16:42:59 -0300 Subject: macos: add best-effort library search for Homebrew --- src/luarocks/core/cfg.lua | 8 ++++++++ 1 file changed, 8 insertions(+) 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) defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" defaults.web_browser = "open" + -- XCode SDK local sdk_path = util.popen_read("xcrun --show-sdk-path 2>/dev/null") if sdk_path then table.insert(defaults.external_deps_dirs, sdk_path .. "/usr") end + + -- Homebrew + table.insert(defaults.external_deps_dirs, "/usr/local/opt") + defaults.external_deps_subdirs.lib = { "", "lib", } + defaults.runtime_external_deps_subdirs.lib = { "", "lib", } + table.insert(defaults.external_deps_patterns.lib, 1, "/?/lib/lib?.dylib") + table.insert(defaults.runtime_external_deps_patterns.lib, 1, "/?/lib/lib?.dylib") end if platforms.linux then -- cgit v1.2.3-55-g6feb