diff options
| author | ruki <[email protected]> | 2022-10-19 00:58:10 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-10-19 00:58:10 +0800 |
| commit | 9b1e01c0b6deb3eaae25038643e11ea482ea248a (patch) | |
| tree | e0911a64e8819432483fb948915f4f85c7efb001 /xmake/core | |
| parent | 78fe5e017f14b4459a36b27548d98af9485e9fff (diff) | |
use sysincludedirs
Diffstat (limited to 'xmake/core')
| -rw-r--r-- | xmake/core/base/table.lua | 2 | ||||
| -rw-r--r-- | xmake/core/package/package.lua | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/xmake/core/base/table.lua b/xmake/core/base/table.lua index 5e04b0256..a360f7b42 100644 --- a/xmake/core/base/table.lua +++ b/xmake/core/base/table.lua @@ -155,7 +155,7 @@ end -- clone table function table.clone(self) - local result + local result = self if type(self) == "table" then result = {} for k, v in pairs(self) do diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 1729eaa00..81b66b945 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1482,12 +1482,21 @@ function _instance:_fetch_library(opt) end end if fetchinfo then + local components_base = fetchinfo.components and fetchinfo.components.__base if opt.external then fetchinfo.sysincludedirs = fetchinfo.sysincludedirs or fetchinfo.includedirs fetchinfo.includedirs = nil + if components_base then + components_base.sysincludedirs = components_base.sysincludedirs or components_base.includedirs + components_base.includedirs = nil + end else fetchinfo.includedirs = fetchinfo.includedirs or fetchinfo.sysincludedirs fetchinfo.sysincludedirs = nil + if components_base then + components_base.includedirs = components_base.includedirs or components_base.sysincludedirs + components_base.sysincludedirs = nil + end end end if fetchinfo and option.get("verbose") then |