diff --git a/var/spack/repos/builtin/packages/cpio/package.py b/var/spack/repos/builtin/packages/cpio/package.py
index d5238cff1cf..2e6f6f49bf7 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)