From 41b68741ec768e3caec8aba6817549da8993408a Mon Sep 17 00:00:00 2001 From: ketsubouchi Date: Mon, 14 Sep 2020 23:55:47 +0900 Subject: cpio: add --rtlib=compiler-rt for %fj (#18619) * cpio: add --rtlib=compiler-rt for %fj * cpio: simplify if * Update var/spack/repos/builtin/packages/cpio/package.py This seems better. Co-authored-by: Adam J. Stewart Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/cpio/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cpio/package.py b/var/spack/repos/builtin/packages/cpio/package.py index d5238cff1c..2e6f6f49bf 100644 --- a/var/spack/repos/builtin/packages/cpio/package.py +++ b/var/spack/repos/builtin/packages/cpio/package.py @@ -22,10 +22,11 @@ class Cpio(AutotoolsPackage, GNUMirrorPackage): def flag_handler(self, name, flags): spec = self.spec - if '%intel' in spec and name == 'cflags': - flags.append('-no-gcc') + if name == 'cflags': + if '%intel' in spec: + flags.append('-no-gcc') - if '%clang' in spec and name == 'cflags': - flags.append('--rtlib=compiler-rt') + elif '%clang' in spec or '%fj' in spec: + flags.append('--rtlib=compiler-rt') return (flags, None, None) -- cgit v1.2.3-70-g09d2