Merge pull request #149 from xylar/fix-chrysalis-arch

Update to spack builds on Chrysalis

Author: xylar

mache/spack/chrysalis_gnu_openmpi.yaml

@@ -42,6 +42,16 @@ spack:
       - spec: [email protected]
         prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/diffutils-3.7-nnauuo4
       buildable: false
+    findutils:
+      externals:
+      - spec: [email protected]
+        prefix: /usr
+      buildable: false
+    gmake:
+      externals:
+      - spec: [email protected]
+        prefix: /usr
+      buildable: false
     libiconv:
       externals:
       - spec: [email protected]
@@ -136,7 +146,7 @@ spack:
         f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-9.2.0-ugetvbp/bin/gfortran
         fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-9.2.0-ugetvbp/bin/gfortran
       flags: {}
-      operating_system: centos8
+      operating_system: rhel8
       target: x86_64
       modules: []
       environment: {}

mache/spack/chrysalis_intel_impi.yaml

@@ -42,6 +42,16 @@ spack:
       - spec: [email protected]
         prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/diffutils-3.7-bml5fc4
       buildable: false
+    findutils:
+      externals:
+      - spec: [email protected]
+        prefix: /usr
+      buildable: false
+    gmake:
+      externals:
+      - spec: [email protected]
+        prefix: /usr
+      buildable: false
     libiconv:
       externals:
       - spec: [email protected]
@@ -136,7 +146,7 @@ spack:
         f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
         fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
       flags: {}
-      operating_system: centos8
+      operating_system: rhel8
       target: x86_64
       modules: []
       environment: {}

mache/spack/chrysalis_intel_openmpi.yaml

@@ -42,6 +42,16 @@ spack:
       - spec: [email protected]
         prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/diffutils-3.7-bml5fc4
       buildable: false
+    findutils:
+      externals:
+      - spec: [email protected]
+        prefix: /usr
+      buildable: false
+    gmake:
+      externals:
+      - spec: [email protected]
+        prefix: /usr
+      buildable: false
     libiconv:
       externals:
       - spec: [email protected]
@@ -136,7 +146,7 @@ spack:
         f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
         fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
       flags: {}
-      operating_system: centos8
+      operating_system: rhel8
       target: x86_64
       modules: []
       environment: {}