summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2023-04-21 11:02:55 +0200
committerGitHub <noreply@github.com>2023-04-21 11:02:55 +0200
commit7cf53a647e8dcd6d3121ed8b0d9f4e8d1e7a39db (patch)
treeab84023bbdc3f550ac56813ce05cf53b64587b8c /var
parentcac44b9e157866f720becd6843ad5df1a1ba8b1d (diff)
downloadspack-7cf53a647e8dcd6d3121ed8b0d9f4e8d1e7a39db.tar.gz
spack-7cf53a647e8dcd6d3121ed8b0d9f4e8d1e7a39db.tar.bz2
spack-7cf53a647e8dcd6d3121ed8b0d9f4e8d1e7a39db.tar.xz
spack-7cf53a647e8dcd6d3121ed8b0d9f4e8d1e7a39db.zip
readline: fix for nvhpc (#37024)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/readline/package.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/readline/package.py b/var/spack/repos/builtin/packages/readline/package.py
index 7dad5f9348..6bc5e0c74d 100644
--- a/var/spack/repos/builtin/packages/readline/package.py
+++ b/var/spack/repos/builtin/packages/readline/package.py
@@ -64,8 +64,11 @@ class Readline(AutotoolsPackage, GNUMirrorPackage):
def build(self, spec, prefix):
make("SHLIB_LIBS=" + spec["ncurses:wide"].libs.ld_flags)
- def patch(self):
- # Remove flags not recognized by the NVIDIA compiler
- if self.spec.satisfies("%nvhpc"):
- filter_file("${GCC+-Wno-parentheses}", "", "configure", string=True)
- filter_file("${GCC+-Wno-format-security}", "", "configure", string=True)
+ def flag_handler(self, name, flags):
+ # nvhpc is detected as a gnu compiler, which causes the build system
+ # to add unrecognized -W flags. Defining CFLAGS overrides those defaults.
+ if name == "cflags" and self.spec.satisfies("%nvhpc"):
+ flags.append("-O2")
+ flags.append("-g")
+ return (None, flags, None)
+ return (flags, None, None)