summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-07-20 22:40:17 +0800
committerruki <[email protected]>2017-07-20 22:40:17 +0800
commit84c43d1e02b430d4d207439803202246d459c1b8 (patch)
tree15aa28f59e2fe0ec695b18bf98fe1fa2bd5a7cfc
parentbe3b116a4078bf95b80c181a9d4cd641094ef0ba (diff)
fix option check
-rw-r--r--xmake/actions/build/builder.lua1
-rw-r--r--xmake/core/project/option.lua7
2 files changed, 2 insertions, 6 deletions
diff --git a/xmake/actions/build/builder.lua b/xmake/actions/build/builder.lua
index a6833f8be..ebe2efc72 100644
--- a/xmake/actions/build/builder.lua
+++ b/xmake/actions/build/builder.lua
@@ -32,6 +32,7 @@ import("core.platform.environment")
function _clean_target(target)
if not target:isphony() then
os.tryrm(target:symbolfile())
+ os.tryrm(target:targetfile())
end
end
diff --git a/xmake/core/project/option.lua b/xmake/core/project/option.lua
index ba3b19904..dcba6a13f 100644
--- a/xmake/core/project/option.lua
+++ b/xmake/core/project/option.lua
@@ -83,10 +83,10 @@ function option:_cx_check()
for _, kind in ipairs({"c", "cxx"}) do
-- get conditions
+ local links = self:get("links")
local snippets = self:get(kind .. "snippet")
local types = self:get(kind .. "types")
local funcs = self:get(kind .. "funcs")
- local links = self:get(kind .. "links")
local includes = self:get(kind .. "includes")
-- need check it?
@@ -115,11 +115,6 @@ function option:_cx_check()
end
end
- -- no checked conditions, passed directly
- if not checked then
- self:enable(true)
- end
-
-- ok
return true
end