diff options
| author | ruki <[email protected]> | 2018-12-21 00:04:36 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-12-20 18:27:39 +0800 |
| commit | f1065f8b97b0521a57782eca4e9758929aebcd70 (patch) | |
| tree | 75ebf78326fccf5dea0a06558603243fce8fed9a /xmake/core/tool/tool.lua | |
| parent | d95758dc85e1e34e6ce507ffee78f7634a0661c5 (diff) | |
improve has_flags tips
Diffstat (limited to 'xmake/core/tool/tool.lua')
| -rw-r--r-- | xmake/core/tool/tool.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/core/tool/tool.lua b/xmake/core/tool/tool.lua index 7556860ab..e082ed592 100644 --- a/xmake/core/tool/tool.lua +++ b/xmake/core/tool/tool.lua @@ -114,14 +114,14 @@ function _instance:has_flags(flags, flagkind) -- import has_flags() self._has_flags = self._has_flags or import("lib.detect.has_flags") - -- get base flags - local baseflags = self:get(self:kind() .. 'flags') - if not baseflags and flagkind then - baseflags = self:get(flagkind) + -- get system flags + local sysflags = self:get(self:kind() .. 'flags') + if not sysflags and flagkind then + sysflags = self:get(flagkind) end -- has flags? - return self._has_flags(self:name(), table.join(flags, baseflags), {program = self:program(), toolkind = self:kind(), flagkind = flagkind}) + return self._has_flags(self:name(), flags, {program = self:program(), toolkind = self:kind(), flagkind = flagkind, sysflags = sysflags}) end -- load the given tool from the given kind |
