From 1328e8632d4ec986f0e0c7943990a159c4c5d30c Mon Sep 17 00:00:00 2001
From: Gerhard Theurich <theurich@sourcespring.net>
Date: Mon, 23 Oct 2023 08:38:55 -0700
Subject: [PATCH] Explicitly use compiler variables when setting
 ESMF_SL_PRELOAD_LIBLINKER to avoid issues on systems that use custom linker
 settings.

---
 build/common.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/common.mk b/build/common.mk
index b717595bbf..5887c52c83 100644
--- 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