diff options
| author | Tom Payerle <payerle@umd.edu> | 2021-08-03 07:35:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 13:35:31 +0200 |
| commit | c7e8bdf9cf0feadb5dabf861af98943552e7e20e (patch) | |
| tree | 7ae775f25e6ca6c30c5f351694936007da908978 /var/spack/repos/builtin/packages/intel-tbb/intel-tbb.nvhpc-remove-flags.2019.7.patch | |
| parent | d33d9d1f035dbc3475b091f8d9a8ab5f2d10a7e7 (diff) | |
| download | spack-c7e8bdf9cf0feadb5dabf861af98943552e7e20e.tar.gz spack-c7e8bdf9cf0feadb5dabf861af98943552e7e20e.tar.bz2 spack-c7e8bdf9cf0feadb5dabf861af98943552e7e20e.tar.xz spack-c7e8bdf9cf0feadb5dabf861af98943552e7e20e.zip | |
intel-tbb: allow compilation with nvhpc (#25044)
These are the versions tested (and successfully patched) against
intel-tbb.nvhpc-remove-flags.2017.patch: @2017, @2017.8, @2018, @2018.6
intel-tbb.nvhpc-remove-flags.2019.patch: @2019
intel-tbb.nvhpc-remove-flags.2019.1.patch: @2019.[1-6]
intel-tbb.nvhpc-remove-flags.2019.7.patch: @2019.[7-8]
intel-tbb.nvhpc-remove-flags.2019.9.patch: @2019.9, 2020.[0-3]
The intel-tbb.nvhpc-version-script-fix.2017.patch was tested and
applied successfully against all of the versions above.
Diffstat (limited to 'var/spack/repos/builtin/packages/intel-tbb/intel-tbb.nvhpc-remove-flags.2019.7.patch')
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-tbb/intel-tbb.nvhpc-remove-flags.2019.7.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/intel-tbb/intel-tbb.nvhpc-remove-flags.2019.7.patch b/var/spack/repos/builtin/packages/intel-tbb/intel-tbb.nvhpc-remove-flags.2019.7.patch new file mode 100644 index 0000000000..e7045f03a3 --- /dev/null +++ b/var/spack/repos/builtin/packages/intel-tbb/intel-tbb.nvhpc-remove-flags.2019.7.patch @@ -0,0 +1,41 @@ +diff -Naur spack-src/build/linux.gcc.inc spack-src.patched/build/linux.gcc.inc +--- spack-src/build/linux.gcc.inc 2019-05-23 06:35:29.000000000 -0400 ++++ spack-src.patched/build/linux.gcc.inc 2021-07-28 16:09:17.574383383 -0400 +@@ -25,7 +25,9 @@ + WARNING_KEY = -Wall + TEST_WARNING_KEY = -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor + +-WARNING_SUPPRESS = -Wno-parentheses ++# Skip for nvhpc compilers ++#WARNING_SUPPRESS = -Wno-parentheses ++WARNING_SUPPRESS = + DYLIB_KEY = -shared + EXPORT_KEY = -Wl,--version-script, + LIBDL = -ldl +@@ -59,10 +61,11 @@ + + # gcc 6.0 and later have -flifetime-dse option that controls + # elimination of stores done outside the object lifetime +-ifneq (,$(shell $(CONLY) -dumpfullversion -dumpversion | egrep "^([6-9])")) +- # keep pre-contruction stores for zero initialization +- DSE_KEY = -flifetime-dse=1 +-endif ++# Skip for nvhpc compilers ++#ifneq (,$(shell $(CONLY) -dumpfullversion -dumpversion | egrep "^([6-9])")) ++# # keep pre-contruction stores for zero initialization ++# DSE_KEY = -flifetime-dse=1 ++#endif + + ifeq ($(cfg), release) + CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD +@@ -145,7 +148,9 @@ + # Setting tbbmalloc data. + #------------------------------------------------------------------------------ + +-M_CPLUS_FLAGS = $(CPLUS_FLAGS) -fno-rtti -fno-exceptions ++# Drop -fno-rtti flag for nvhpc compilers ++#M_CPLUS_FLAGS = $(CPLUS_FLAGS) -fno-rtti -fno-exceptions ++M_CPLUS_FLAGS = $(CPLUS_FLAGS) -fno-exceptions + + #------------------------------------------------------------------------------ + # End of setting tbbmalloc data. |