nvcc needs clang++ to build the kernels, fails with gcc 14

Xpra-org · Sep 4, 2024 · 3a6be55 · 3a6be55
1 parent 9d7f74b
commit 3a6be55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/packaging/rpm/xpra.spec b/packaging/rpm/xpra.spec
@@ -75,6 +75,9 @@ Requires:			xpra-audio = %{version}-%{release}
 Recommends:			xpra-audio = %{version}-%{release}
 %endif
 BuildRequires:		gcc
+%if 0%{?fedora}>=40
+BuildRequires:		clang
+%endif
 BuildRequires:		gcc-c++
 BuildRequires:		python3-Cython
 BuildRequires:		pkgconfig

diff --git a/setup.py b/setup.py
@@ -2293,6 +2293,8 @@ def get_nvcc_args():
                 nvcc_cmd.append("-std=c++11")
             if gcc_version>=(12, 0) or CC_is_clang():
                 nvcc_cmd.append("--allow-unsupported-compiler")
+            if gcc_version>=(14, 0) and not CC_is_clang():
+                nvcc_cmd.append("-ccbin=clang++")
             if nvcc_version>=(11, 5):
                 nvcc_cmd += ["-arch=all",
                         "-Wno-deprecated-gpu-targets",