From 7cf53a647e8dcd6d3121ed8b0d9f4e8d1e7a39db Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Fri, 21 Apr 2023 11:02:55 +0200 Subject: readline: fix for nvhpc (#37024) --- var/spack/repos/builtin/packages/readline/package.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'var') 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) -- cgit v1.2.3-70-g09d2