diff --git a/cime_config/machines/cmake_macros/gnu_chicoma-cpu.cmake b/cime_config/machines/cmake_macros/gnu_chicoma-cpu.cmake
index a6148451eb76..a6c13942620f 100644
--- a/cime_config/machines/cmake_macros/gnu_chicoma-cpu.cmake
+++ b/cime_config/machines/cmake_macros/gnu_chicoma-cpu.cmake
@@ -5,6 +5,7 @@ endif()
set(PIO_FILESYSTEM_HINTS "lustre")
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -g")
+string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,--enable-new-dtags")
set(MPICC "cc")
set(MPICXX "CC")
set(MPIFC "ftn")
diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
index 7af65ddcccbf..a16a5fe0b67a 100644
--- a/cime_config/machines/config_machines.xml
+++ b/cime_config/machines/config_machines.xml
@@ -3937,7 +3937,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
/usr/projects/e3sm/inputdata/atm/datm7
/lustre/scratch5/$ENV{USER}/E3SM/archive/$CASE
/lustre/scratch5/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER
- /usr/projects/climate/SHARED_CLIMATE/software/badger/cprnc
+ /usr/projects/e3sm/software/chicoma-cpu/cprnc
10
e3sm_developer
4
@@ -3957,11 +3957,11 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
- /usr/share/lmod/8.3.1/init/perl
+ /usr/share/lmod/lmod/init/perl
- /usr/share/lmod/8.3.1/init/python
- /usr/share/lmod/8.3.1/init/sh
- /usr/share/lmod/8.3.1/init/csh
+ /usr/share/lmod/lmod/init/python
+ /usr/share/lmod/lmod/init/sh
+ /usr/share/lmod/lmod/init/csh
/usr/share/lmod/lmod/libexec/lmod perl
/usr/share/lmod/lmod/libexec/lmod python
module
@@ -3973,39 +3973,42 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
cray-parallel-netcdf
cray-netcdf
cray-hdf5
- PrgEnv-gnu
- PrgEnv-intel
- PrgEnv-nvidia
- PrgEnv-cray
- PrgEnv-aocc
+ gcc
+ gcc-native
intel
intel-oneapi
nvidia
aocc
cudatoolkit
climate-utils
+ cray-libsci
craype-accel-nvidia80
craype-accel-host
perftools-base
perftools
darshan
+ PrgEnv-gnu
+ PrgEnv-intel
+ PrgEnv-nvidia
+ PrgEnv-cray
+ PrgEnv-aocc
- PrgEnv-gnu/8.4.0
- gcc/12.2.0
- cray-libsci/23.05.1.4
+ PrgEnv-gnu/8.5.0
+ gcc-native/12.3
+ cray-libsci/23.12.5
- PrgEnv-nvidia/8.4.0
- nvidia/22.7
- cray-libsci/23.05.1.4
+ PrgEnv-nvidia/8.5.0
+ nvidia/24.7
+ cray-libsci/23.12.5
- PrgEnv-intel/8.4.0
- intel-classic/2023.2.0
+ PrgEnv-intel/8.5.0
+ intel/2023.2.0
@@ -4016,13 +4019,12 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
craype-accel-host
- craype/2.7.21
- cray-mpich/8.1.26
- libfabric/1.15.2.0
- cray-hdf5-parallel/1.12.2.3
- cray-netcdf-hdf5parallel/4.9.0.3
- cray-parallel-netcdf/1.12.3.3
- cmake/3.25.1
+ craype/2.7.30
+ cray-mpich/8.1.28
+ cray-hdf5-parallel/1.12.2.9
+ cray-netcdf-hdf5parallel/4.9.0.9
+ cray-parallel-netcdf/1.12.3.9
+ cmake/3.27.7
@@ -4044,6 +4046,9 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}
$ENV{CRAY_PARALLEL_NETCDF_PREFIX}
+
+ /usr/lib64/gcc/x86_64-suse-linux/12:$ENV{LD_LIBRARY_PATH}
+
-1
diff --git a/components/mpas-framework/Makefile b/components/mpas-framework/Makefile
index 1f9b00844e72..f92606987bbb 100644
--- a/components/mpas-framework/Makefile
+++ b/components/mpas-framework/Makefile
@@ -396,11 +396,11 @@ gnu-cray:
"FFLAGS_OPT = -O3 -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form -ffpe-summary=none $${EXTRA_FFLAGS}" \
"CFLAGS_OPT = -O3 -m64" \
"CXXFLAGS_OPT = -O3 -m64" \
- "LDFLAGS_OPT = -O3 -m64" \
+ "LDFLAGS_OPT = -O3 -m64 $(GNU_CRAY_LDFLAGS)" \
"FFLAGS_DEBUG = -g -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow -ffpe-summary=none $${EXTRA_FFLAGS}" \
"CFLAGS_DEBUG = -g -m64" \
"CXXFLAGS_DEBUG = -g -m64" \
- "LDFLAGS_DEBUG = -g -m64" \
+ "LDFLAGS_DEBUG = -g -m64 $(GNU_CRAY_LDFLAGS)" \
"FFLAGS_OMP = -fopenmp" \
"CFLAGS_OMP = -fopenmp" \
"BUILD_TARGET = $(@)" \