Merge branch 'fix/darwin_gfortranclang' into patch/8.4.2

esmf-org · Apr 21, 2023 · 12616b5 · 12616b5
2 parents 5a126a8 + 606ea95
commit 12616b5
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/build_config/Darwin.gfortranclang.default/build_rules.mk b/build_config/Darwin.gfortranclang.default/build_rules.mk
@@ -221,7 +221,7 @@ ESMF_CRPATHPREFIX = -Wl,-rpath,
 # Determine where gfortran's libraries are located
 #
 ESMF_LIBGFORTRAN := $(shell $(ESMF_F90COMPILER) -print-file-name=libgfortran.dylib)
-ifeq ($(ESMF_LIBSTDCXX),libgfortran.dylib)
+ifeq ($(ESMF_LIBGFORTRAN),libgfortran.dylib)
 ESMF_LIBGFORTRAN := $(shell $(ESMF_F90COMPILER) -print-file-name=libgfortran.a)
 endif
 ESMF_CXXLINKPATHS += -L$(dir $(ESMF_LIBGFORTRAN))
@@ -230,6 +230,18 @@ ESMF_CXXLINKRPATHS += $(ESMF_CXXRPATHPREFIX)$(dir $(ESMF_LIBGFORTRAN))
 ESMF_F90LINKPATHS += -L$(dir $(ESMF_LIBGFORTRAN))
 ESMF_F90LINKRPATHS += $(ESMF_CXXRPATHPREFIX)$(dir $(ESMF_LIBGFORTRAN))
 
+############################################################
+# Link against the c++ library
+#
+# Although we use the C++ linker for Fortran programs under ESMF, users might not, so still
+# add on the C++ specific information
+ESMF_LIBSTDCXX := $(shell $(ESMF_CXXCOMPILER) -print-file-name=libc++.dylib)
+ifeq ($(ESMF_LIBSTDCXX),libc++.dylib)
+ESMF_LIBSTDCXX := $(shell $(ESMF_CXXCOMPILER) -print-file-name=libc++.a)
+endif
+ESMF_F90LINKPATHS += -L$(dir $(ESMF_LIBSTDCXX))
+ESMF_F90LINKLIBS += -lm -lc++
+
 ############################################################
 # Link against libesmf.a using the C++ linker front-end
 #