diff options
| author | ruki <[email protected]> | 2021-03-18 23:29:20 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-03-18 23:29:20 +0800 |
| commit | 6c5d06600df7b859791fafb8ea87fd87f63fb825 (patch) | |
| tree | 87543d39131ce6437a70a4355fb291e7b0867182 /xmake/core/package/package.lua | |
| parent | 5f4104bb7c5b188965f30d401762162294764b73 (diff) | |
improve ndk toolchain
Diffstat (limited to 'xmake/core/package/package.lua')
| -rw-r--r-- | xmake/core/package/package.lua | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 7c6d0b3d6..f2c437924 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1362,8 +1362,8 @@ end -- @return true or false -- function _instance:has_cfuncs(funcs, opt) - if self:plat() ~= config.get("plat") then - -- TODO + if not self:is_plat(config.get("plat")) or self:config("toolchains") then + -- TODO we also need check it later for package with custom toolchains return true end opt = opt or {} @@ -1379,8 +1379,8 @@ end -- @return true or false -- function _instance:has_cxxfuncs(funcs, opt) - if self:plat() ~= config.get("plat") then - -- TODO + if not self:is_plat(config.get("plat")) or self:config("toolchains") then + -- TODO we also need check it later for package with custom toolchains return true end opt = opt or {} @@ -1396,8 +1396,8 @@ end -- @return true or false -- function _instance:has_ctypes(types, opt) - if self:plat() ~= config.get("plat") then - -- TODO + if not self:is_plat(config.get("plat")) or self:config("toolchains") then + -- TODO we also need check it later for package with custom toolchains return true end opt = opt or {} @@ -1413,8 +1413,8 @@ end -- @return true or false -- function _instance:has_cxxtypes(types, opt) - if self:plat() ~= config.get("plat") then - -- TODO + if not self:is_plat(config.get("plat")) or self:config("toolchains") then + -- TODO we also need check it later for package with custom toolchains return true end opt = opt or {} @@ -1430,8 +1430,8 @@ end -- @return true or false -- function _instance:has_cincludes(includes, opt) - if self:plat() ~= config.get("plat") then - -- TODO + if not self:is_plat(config.get("plat")) or self:config("toolchains") then + -- TODO we also need check it later for package with custom toolchains return true end opt = opt or {} @@ -1447,8 +1447,8 @@ end -- @return true or false -- function _instance:has_cxxincludes(includes, opt) - if self:plat() ~= config.get("plat") then - -- TODO + if not self:is_plat(config.get("plat")) or self:config("toolchains") then + -- TODO we also need check it later for package with custom toolchains return true end opt = opt or {} @@ -1464,8 +1464,8 @@ end -- @return true or false -- function _instance:check_csnippets(snippets, opt) - if self:plat() ~= config.get("plat") then - -- TODO + if not self:is_plat(config.get("plat")) or self:config("toolchains") then + -- TODO we also need check it later for package with custom toolchains return true end opt = opt or {} @@ -1481,8 +1481,8 @@ end -- @return true or false -- function _instance:check_cxxsnippets(snippets, opt) - if self:plat() ~= config.get("plat") then - -- TODO + if not self:is_plat(config.get("plat")) or self:config("toolchains") then + -- TODO we also need check it later for package with custom toolchains return true end opt = opt or {} |