diff --git a/env/merlin/sysconfigs/compilers.yaml b/env/merlin/sysconfigs/compilers.yaml index 0b8e0dc..34a145c 100644 --- a/env/merlin/sysconfigs/compilers.yaml +++ b/env/merlin/sysconfigs/compilers.yaml @@ -1,18 +1,5 @@ --- compilers: - - compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: [] - operating_system: rhel7 - paths: - cc: /usr/bin/gcc - cxx: /usr/bin/g++ - f77: /usr/bin/gfortran - fc: /usr/bin/gfortran - spec: gcc@4.8.5 - target: x86_64 - compiler: environment: {} extra_rpaths: [] @@ -26,19 +13,6 @@ compilers: fc: /opt/psi/Programming/intel/22.2/compiler/2022.1.0/linux/bin/ifx spec: dpcpp@2022.1.0 target: x86_64 - - compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: [] - operating_system: rhel7 - paths: - cc: /opt/psi/Programming/gcc/9.3.0/bin/gcc - cxx: /opt/psi/Programming/gcc/9.3.0/bin/g++ - f77: /opt/psi/Programming/gcc/9.3.0/bin/gfortran - fc: /opt/psi/Programming/gcc/9.3.0/bin/gfortran - spec: gcc@9.3.0 - target: x86_64 - compiler: environment: {} extra_rpaths: [] @@ -72,11 +46,24 @@ compilers: modules: [] operating_system: rhel7 paths: - cc: /opt/psi/Programming/gcc/9.5.0/bin/gcc - cxx: /opt/psi/Programming/gcc/9.5.0/bin/g++ - f77: /opt/psi/Programming/gcc/9.5.0/bin/gfortran - fc: /opt/psi/Programming/gcc/9.5.0/bin/gfortran - spec: gcc@9.5.0 + cc: /opt/psi/Programming/gcc/12.1.0/bin/gcc + cxx: /opt/psi/Programming/gcc/12.1.0/bin/g++ + f77: /opt/psi/Programming/gcc/12.1.0/bin/gfortran + fc: /opt/psi/Programming/gcc/12.1.0/bin/gfortran + spec: gcc@12.1.0 + target: x86_64 + - compiler: + environment: {} + extra_rpaths: [] + flags: {} + modules: [] + operating_system: rhel7 + paths: + cc: /opt/psi/Programming/clang/12.0.0_rhel7/bin/clang + cxx: /opt/psi/Programming/clang/12.0.0_rhel7/bin/clang++ + f77: null + fc: null + spec: clang@12.0.0 target: x86_64 - compiler: environment: {}