diff options
| author | ruki <[email protected]> | 2019-06-12 23:05:07 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-06-12 12:30:45 +0800 |
| commit | bf7331c60d83218fbf58431a7d757420549b60fa (patch) | |
| tree | 773a04f74d4315dd9a7e8140583e8b76176d8203 | |
| parent | a42d2ff6c4b54bc63a4126c9f61ad83b7cb0f18a (diff) | |
use cuda.devlink value to disable devlink
| -rw-r--r-- | xmake/core/project/target.lua | 7 | ||||
| -rw-r--r-- | xmake/rules/cuda/devlink/xmake.lua | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 03fc633af..fbb6f734c 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -333,7 +333,12 @@ function _instance:values(name, sourcefile) -- get values from target table.join2(values, self:get("values." .. name)) - return #values > 0 and table.unwrap(values) or nil + if #values > 0 then + values = table.unwrap(values) + else + values = nil + end + return values end -- set values diff --git a/xmake/rules/cuda/devlink/xmake.lua b/xmake/rules/cuda/devlink/xmake.lua index f3ae08bc2..9df1a32ee 100644 --- a/xmake/rules/cuda/devlink/xmake.lua +++ b/xmake/rules/cuda/devlink/xmake.lua @@ -18,13 +18,7 @@ -- @file xmake.lua -- --- define rule: disable the default device-link -rule("cuda.nodevlink") - before_load(function (target) - target:data_set("cuda.nodevlink", true) - end) - --- define rule: device-link (default) +-- define rule: device-link rule("cuda.devlink") -- add rule: cuda environment @@ -40,7 +34,7 @@ rule("cuda.devlink") before_link(function (target, opt) -- disable devlink? - if target:data("cuda.nodevlink") then + if target:values("cuda.devlink") == false then return end |