summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorketsubouchi <kenta.tsubouchi@hac-inc.co.jp>2020-09-14 23:55:47 +0900
committerGitHub <noreply@github.com>2020-09-14 09:55:47 -0500
commit41b68741ec768e3caec8aba6817549da8993408a (patch)
tree7be3b2da490c5c37cdddc4bc51a6adc33f3e3dd9
parenta2500064492040eebcf9835849f313fbed48d6a6 (diff)
downloadspack-41b68741ec768e3caec8aba6817549da8993408a.tar.gz
spack-41b68741ec768e3caec8aba6817549da8993408a.tar.bz2
spack-41b68741ec768e3caec8aba6817549da8993408a.tar.xz
spack-41b68741ec768e3caec8aba6817549da8993408a.zip
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 <ajstewart426@gmail.com> Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/cpio/package.py9
1 files changed, 5 insertions, 4 deletions
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)