diff -Naur spack-src/build/linux.gcc.inc spack-src.patched/build/linux.gcc.inc
--- spack-src/build/linux.gcc.inc	2018-03-30 11:55:05.000000000 -0400
+++ spack-src.patched/build/linux.gcc.inc	2021-07-22 15:58:22.876292608 -0400
@@ -17,7 +17,9 @@
 #
 
 COMPILE_ONLY = -c -MMD
-PREPROC_ONLY = -E -x c++
+# For nvc++, need --no_preincludes as well to avoid issues with
+# pre-included content interfering with version scripts, etc.
+PREPROC_ONLY = -E -x c++ --no_preincludes
 INCLUDE_KEY = -I
 DEFINE_KEY = -D
 OUTPUT_KEY = -o #