diff options
| author | ruki <[email protected]> | 2018-10-09 22:58:47 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-10-09 11:52:47 +0800 |
| commit | d4a0b79c1b033acf0fb9d5f305c135b3f6c6ae2a (patch) | |
| tree | 0b532b01bd9fd417822b1861e8829f42c3e39e11 | |
| parent | 56043ebcd54578b090b848f9cd9a5e7616e7dd0e (diff) | |
improve pkg-config package
| -rw-r--r-- | xmake/repository/packages/p/pkg-config/xmake.lua | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xmake/repository/packages/p/pkg-config/xmake.lua b/xmake/repository/packages/p/pkg-config/xmake.lua index 754ecd1f7..036bc9407 100644 --- a/xmake/repository/packages/p/pkg-config/xmake.lua +++ b/xmake/repository/packages/p/pkg-config/xmake.lua @@ -14,11 +14,7 @@ package("pkg-config") on_install("macosx", "linux", function (package) local pcpath = {"/usr/local/lib/pkgconfig", "/usr/lib/pkgconfig"} if is_host("macosx") then - local macver = os.iorun("sw_vers -productVersion"):trim() - if #macver > 0 then - local vers = macver:split('%.') - table.insert(pcpath, "/usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig/" .. vers[1] .. '.' .. vers[2]) - end + table.insert(pcpath, "/usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig/" .. macos.version():major() .. '.' .. macos.version():minor()) end import("package.tools.autoconf").install(package, {"--disable-debug", "--disable-host-tool", "--with-internal-glib", ["with-pc-path"] = table.concat(pcpath, ':')}) end) |