diff options
| author | Victor Brunini <victorbrunini@gmail.com> | 2023-04-28 06:37:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 09:37:58 -0400 |
| commit | 4363b1c2dcdae9245054cd44124f8ac6789bfd39 (patch) | |
| tree | 4254fbe4266e94fcbd0d88d3e0ee5d951161eef9 /var | |
| parent | c85877566f4793ae97848d9c23828d9fe8dd7edd (diff) | |
| download | spack-4363b1c2dcdae9245054cd44124f8ac6789bfd39.tar.gz spack-4363b1c2dcdae9245054cd44124f8ac6789bfd39.tar.bz2 spack-4363b1c2dcdae9245054cd44124f8ac6789bfd39.tar.xz spack-4363b1c2dcdae9245054cd44124f8ac6789bfd39.zip | |
superlu-dist: do not discard cflags from Spack (#37260)
Make sure to append additional flags needed for specific compilers
in the flag_handler instead of adding them as separate cmake define
lines that override the main spack cflags.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/superlu-dist/package.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 074737c09a..ad30dff284 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -101,16 +101,6 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): [spec["parmetis"].prefix.include, spec["metis"].prefix.include], ) - if (spec.satisfies("%xl") or spec.satisfies("%xl_r")) and spec.satisfies("@:6.1.1"): - append_define("CMAKE_C_FLAGS", "-DNoChange") - if spec.satisfies("%oneapi") or spec.satisfies("%arm@23.04:"): - # - # 2022 and later Intel OneAPI compilers and Arm compilers version 23.04 and later - # throw errors compiling some of the non ISO C99 compliant code in this package - # see https://reviews.llvm.org/D122983 - # - append_define("CMAKE_C_FLAGS", "-Wno-error=implicit-function-declaration") - append_define("XSDK_INDEX_SIZE", "64" if "+int64" in spec else "32") append_from_variant("enable_openmp", "openmp") @@ -142,7 +132,20 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): flags.append(self.compiler.cxx11_flag) if name == "cflags" and "%pgi" not in self.spec: flags.append("-std=c99") - if name == "cflags" and self.spec.satisfies("%oneapi"): + if ( + name == "cflags" + and (self.spec.satisfies("%xl") or self.spec.satisfies("%xl_r")) + and self.spec.satisfies("@:6.1.1") + ): + flags.append("-DNoChange") + if name == "cflags" and ( + self.spec.satisfies("%oneapi") or self.spec.satisfies("%arm@23.04:") + ): + # + # 2022 and later Intel OneAPI compilers and Arm compilers version 23.04 and later + # throw errors compiling some of the non ISO C99 compliant code in this package + # see https://reviews.llvm.org/D122983 + # flags.append("-Wno-error=implicit-function-declaration") return (None, None, flags) |