summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-05-26 12:28:21 +0800
committerruki <[email protected]>2017-05-26 12:28:21 +0800
commit14e61e29f039298b4f86562acff806606ce840f2 (patch)
tree52ac69f6a01923eec18f6a9692a42468f4978d0c
parent8eb5a86661ba0abba0692fb41fe2b61d7609ab34 (diff)
improve match script
-rw-r--r--xmake/core/project/target.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index cd794cb90..bfb986123 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -644,7 +644,14 @@ function target:script(name, generic)
local plat = (config.get("plat") or "")
local pattern = plat .. '|' .. (config.get("arch") or "")
for _pattern, _script in pairs(script) do
- if not _pattern:startswith("__") and (plat == _pattern or pattern:find('^' .. _pattern .. '$')) then
+ if not _pattern:startswith("__") and pattern:find('^' .. _pattern .. '$') then
+ return _script
+ end
+ end
+
+ -- match script for special plat
+ for _pattern, _script in pairs(script) do
+ if not _pattern:startswith("__") and plat:find('^' .. _pattern .. '$') then
return _script
end
end