Explicitly use compiler variables when setting ESMF_SL_PRELOAD_LIBLINKER

to avoid issues on systems that use custom linker settings.
esmf-org · Oct 23, 2023 · 1328e86 · 1328e86
1 parent 1bed7e4
commit 1328e86
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/build/common.mk b/build/common.mk
@@ -2025,11 +2025,11 @@ ESMF_PRELOADSCRIPT = $(ESMF_LIBDIR)/preload.sh
 ifeq ($(ESMF_OS),Darwin)
 ESMF_ENV_PRELOAD          = DYLD_INSERT_LIBRARIES
 ESMF_ENV_PRELOAD_DELIMIT  = ':'
-ESMF_SL_PRELOAD_LIBLINKER = $(ESMF_F90LINKER)
+ESMF_SL_PRELOAD_LIBLINKER = $(ESMF_F90COMPILER)
 else
 ESMF_ENV_PRELOAD          = LD_PRELOAD
 ESMF_ENV_PRELOAD_DELIMIT  = ' '
-ESMF_SL_PRELOAD_LIBLINKER = $(ESMF_SL_LIBLINKER)
+ESMF_SL_PRELOAD_LIBLINKER = $(ESMF_CXXCOMPILER)
 endif
 
 # MPI implementations do not pick up LD_PRELOAD