Merge branch 'master' of https://github.com/xmake-io/xmake into modnamefix

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