diff options
| author | ruki <[email protected]> | 2022-01-15 14:34:51 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-01-15 14:34:51 +0800 |
| commit | 909b14dd4774e651d778a575a0e99dcfdd22b41b (patch) | |
| tree | 7e0b65fb2ff0e4e329f497ed7c8d14715f14c11b | |
| parent | e628a134af84c81f725bb63bcfe0b6b3245e7da6 (diff) | |
| parent | ee3d9eec62839bf19f5e44b45b2b8749e51f318b (diff) | |
Merge pull request #1977 from xq114/patch-3
fix cuda build on windows
| -rw-r--r-- | xmake/rules/cuda/devlink/xmake.lua | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xmake/rules/cuda/devlink/xmake.lua b/xmake/rules/cuda/devlink/xmake.lua index fb1f603b0..67c7836eb 100644 --- a/xmake/rules/cuda/devlink/xmake.lua +++ b/xmake/rules/cuda/devlink/xmake.lua @@ -37,13 +37,14 @@ rule("cuda.build.devlink") import("utils.progress") -- disable devlink? - if target:values("cuda.build.devlink") == false then + local devlink = target:values("cuda.build.devlink") + if devlink == false then return end - -- only for binary/shared - local targetkind = target:kind() - if targetkind ~= "binary" and targetkind ~= "shared" then + -- only for binary/shared on non-windows platforms + -- https://github.com/xmake-io/xmake/issues/1976 + if not (devlink == true or target:is_plat("windows") or target:is_binary() or target:is_shared()) then return end @@ -54,7 +55,7 @@ rule("cuda.build.devlink") local culdflags = {"-dlink"} -- add shared flag - if targetkind == "shared" then + if target:is_shared() then table.insert(culdflags, "-shared") end |
