Merge pull request #2101 from xq114/master

improve xmake update integrate and cuda has_flags

1 files changed, 9 insertions, 0 deletions

diff --git a/xmake/modules/detect/tools/nvcc/has_flags.lua b/xmake/modules/detect/tools/nvcc/has_flags.lua
index c30c87363..d96ffdfe8 100644
--- a/xmake/modules/detect/tools/nvcc/has_flags.lua
+++ b/xmake/modules/detect/tools/nvcc/has_flags.lua
@@ -122,6 +122,15 @@ function _check_try_running(flags, opt, islinker)
         end
     end
 
+    -- add architecture flags if cross compiling
+    if not is_arch(os.arch()) then
+        if is_arch(".+64.*") then
+            table.insert(args, 1, "-m64")
+        else
+            table.insert(args, 1, "-m32")
+        end
+    end
+
     -- check flags
     return _try_running(opt.program, table.join(flags, args), opt)
 end