From 51d5cf49072b0068663f5a93f0f54374441ce005 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 27 Apr 2018 22:50:48 +0800 Subject: fix custom rule --- xmake/actions/build/kinds/binary.lua | 2 +- xmake/actions/build/kinds/shared.lua | 2 +- xmake/actions/build/kinds/static.lua | 2 +- 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) -- cgit v1.3.1