Revert "Revert "Move nvc++ to gpu instance (#4326)""

This reverts commit 85120d9.
compiler-explorer · Nov 23, 2022 · 88331f7 · 88331f7
1 parent 093ab95
commit 88331f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
@@ -1,4 +1,7 @@
-compilers=&gcc86:&icc:&icx:&clang:&clangx86trunk:&clang-rocm:&mosclang-trunk:&rvclang:&wasmclang:&cl:&cross:&ellcc:&zapcc:&djggp:www.godbolt.ms@443:&armclang32:&armclang64:&zigcxx:&cxx6502:&nvcxx_x86_cxx:&nvcxx_arm_cxx
+compilers=&gcc86:&icc:&icx:&clang:&clangx86trunk:&clang-rocm:&mosclang-trunk:&rvclang:&wasmclang:&cl:&cross:&ellcc:&zapcc:&djggp:www.godbolt.ms@443:&armclang32:&armclang64:&zigcxx:&cxx6502:&nvcxx_arm_cxx:godbolt.org@443/gpu
+# Disabled: nvcxx_x86_cxx
+# The disabled groups are actually used in the c++.gpu.properties. One day these might exist on both servers, so I want
+# to keep them in the same place.
 defaultCompiler=g122
 demangler=/opt/compiler-explorer/gcc-12.2.0/bin/c++filt
 objdumper=/opt/compiler-explorer/gcc-12.2.0/bin/objdump

diff --git a/etc/config/c++.gpu.properties b/etc/config/c++.gpu.properties
@@ -0,0 +1,4 @@
+# Compiler settings inherited from amazon.properties to keep them in sync
+# Disabled: nvcxx_x86_cxx
+compilers=&nvcxx_x86_cxx
+supportsExecute=true
diff --git a/etc/config/compiler-explorer.gpu.properties b/etc/config/compiler-explorer.gpu.properties
@@ -1,2 +1,2 @@
 httpRoot=/gpu
-restrictToLanguages=cuda
+restrictToLanguages=c++,cuda