summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-04-27 22:50:48 +0800
committerruki <[email protected]>2018-04-27 11:04:52 +0800
commit51d5cf49072b0068663f5a93f0f54374441ce005 (patch)
tree96a511e23db2e08b3ff8e1c870557e7c79d43b85
parent0ffc60c034373cf7f347eac69e5d6c67d4294d7e (diff)
fix custom rule
-rw-r--r--xmake/actions/build/kinds/binary.lua2
-rw-r--r--xmake/actions/build/kinds/shared.lua2
-rw-r--r--xmake/actions/build/kinds/static.lua2
3 files changed, 3 insertions, 3 deletions
diff --git a/xmake/actions/build/kinds/binary.lua b/xmake/actions/build/kinds/binary.lua
index a0b81d3b6..b148290fe 100644
--- a/xmake/actions/build/kinds/binary.lua
+++ b/xmake/actions/build/kinds/binary.lua
@@ -190,7 +190,7 @@ function build(target, buildinfo)
end
-- build target
- if kindcount == 1 and sourcekind and compiler.buildmode(sourcekind, "binary:sources", {target = target}) then
+ if kindcount == 1 and sourcekind and not sourcekind:startswith("__rule_") and compiler.buildmode(sourcekind, "binary:sources", {target = target}) then
_build_from_sources(target, buildinfo, sourcebatch, sourcekind)
else
_build_from_objects(target, buildinfo)
diff --git a/xmake/actions/build/kinds/shared.lua b/xmake/actions/build/kinds/shared.lua
index 5e44c3599..0c6a1023a 100644
--- a/xmake/actions/build/kinds/shared.lua
+++ b/xmake/actions/build/kinds/shared.lua
@@ -206,7 +206,7 @@ function build(target, buildinfo)
end
-- build target
- if kindcount == 1 and sourcekind and compiler.buildmode(sourcekind, "shared:sources", {target = target}) then
+ if kindcount == 1 and sourcekind and not sourcekind:startswith("__rule_") and compiler.buildmode(sourcekind, "shared:sources", {target = target}) then
_build_from_sources(target, buildinfo, sourcebatch, sourcekind)
else
_build_from_objects(target, buildinfo)
diff --git a/xmake/actions/build/kinds/static.lua b/xmake/actions/build/kinds/static.lua
index 8a9df2634..4aa4f10c3 100644
--- a/xmake/actions/build/kinds/static.lua
+++ b/xmake/actions/build/kinds/static.lua
@@ -206,7 +206,7 @@ function build(target, buildinfo)
end
-- build target
- if kindcount == 1 and sourcekind and compiler.buildmode(sourcekind, "static:sources", {target = target}) then
+ if kindcount == 1 and sourcekind and not sourcekind:startswith("__rule_") and compiler.buildmode(sourcekind, "static:sources", {target = target}) then
_build_from_sources(target, buildinfo, sourcebatch, sourcekind)
else
_build_from_objects(target, buildinfo)