From ed155274912f3eded8833ae644625e6017637634 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 20 Sep 2020 17:38:52 -0700
Subject: [PATCH] remove explicit linking of libstdc++

The autotools build should now be compatible with libc++. Closes #163.
---
 CHANGELOG.md               | 1 +
 cmd/dot/Makefile.am        | 4 ++--
 cmd/edgepaint/Makefile.am  | 2 +-
 cmd/mingle/Makefile.am     | 2 +-
 configure.ac               | 2 +-
 debian/TODO                | 1 -
 plugin/gdiplus/Makefile.am | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 433f193c6..c7e69f4b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - sfio does compile time benchmarknig #1422
 - iffe "lib" check always succeeds when compiler optimises #1521
 - syntax error near text who is not present #1411
+- Explicitly links with libstdc++; should allow libc++ if appropriate #163
 
 ## [2.44.1] - 2020-06-29
 
diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 0661110c8..a40d45aad 100644
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -134,8 +134,8 @@ endif
 endif
 
 if WITH_LASI
-dot_static_LDADD += $(top_builddir)/plugin/lasi/.libs/libgvplugin_lasi_C.a $(LASI_LIBS) -lstdc++
-dot_builtins_LDADD += $(top_builddir)/plugin/lasi/libgvplugin_lasi.la $(LASI_LIBS) -lstdc++
+dot_static_LDADD += $(top_builddir)/plugin/lasi/.libs/libgvplugin_lasi_C.a $(LASI_LIBS)
+dot_builtins_LDADD += $(top_builddir)/plugin/lasi/libgvplugin_lasi.la $(LASI_LIBS)
 endif
 
 # add a non-existent C++ source to force the C++ compiler to be used for
diff --git a/cmd/edgepaint/Makefile.am b/cmd/edgepaint/Makefile.am
index 735db97cc..32f3f977c 100644
--- a/cmd/edgepaint/Makefile.am
+++ b/cmd/edgepaint/Makefile.am
@@ -37,7 +37,7 @@ edgepaint_LDADD = \
 	$(top_builddir)/lib/edgepaint/liblab_gamut.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
 	$(top_builddir)/lib/cdt/libcdt.la \
-	$(ANN_LIBS) -lstdc++ -lm
+	$(ANN_LIBS) -lm
 
 # add a non-existent C++ source to force the C++ compiler to be used for
 # linking, so the C++ standard library is included for our C++ dependencies
diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am
index 9768b3e51..5c126204a 100644
--- a/cmd/mingle/Makefile.am
+++ b/cmd/mingle/Makefile.am
@@ -38,7 +38,7 @@ mingle_LDADD = \
 	$(top_builddir)/lib/common/libcommon_C.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
 	$(top_builddir)/lib/cdt/libcdt.la \
-	$(ANN_LIBS) -lstdc++ -lm 
+	$(ANN_LIBS) -lm
 
 # add a non-existent C++ source to force the C++ compiler to be used for
 # linking, so the C++ standard library is included for our C++ dependencies
diff --git a/configure.ac b/configure.ac
index c1f184b9a..9b7768427 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2817,7 +2817,7 @@ else
     use_ipsepcola="Yes"
     AC_DEFINE_UNQUOTED(IPSEPCOLA,1,[Define if you want IPSEPCOLA])
     IPSEPCOLA_INCLUDES='-I$(top_srcdir)/lib/vpsc'
-    IPSEPCOLA_LIBS='$(top_builddir)/lib/vpsc/libvpsc_C.la -lstdc++'
+    IPSEPCOLA_LIBS='$(top_builddir)/lib/vpsc/libvpsc_C.la'
     AC_SUBST([IPSEPCOLA_INCLUDES])
     AC_SUBST([IPSEPCOLA_LIBS])
   fi
diff --git a/debian/TODO b/debian/TODO
index 0f28bf9f8..9640611bc 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -11,7 +11,6 @@ TODO for graphviz
     see debian/rules.
   * Think about putting the configuration file into /var, see the discussion
     with Alexander on the 10th of August.
-  * Stop using -lstdc++ and use CXX (not trivial actually).
   * Adjust --build and --host options to ./configure so as to support cross-
     compilation correctly.
   * The Conflicts between libgv-perl and older graphviz might go away since the
diff --git a/plugin/gdiplus/Makefile.am b/plugin/gdiplus/Makefile.am
index faf9f9f2f..31056ff00 100644
--- a/plugin/gdiplus/Makefile.am
+++ b/plugin/gdiplus/Makefile.am
@@ -36,7 +36,7 @@ libgvplugin_gdiplus_C_la_SOURCES = \
 libgvplugin_gdiplus_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -Wl,"$(PLATFORMSDKLIB)\GdiPlus.lib"
 nodist_libgvplugin_gdiplus_la_SOURCES = GdiPlus*.h
 libgvplugin_gdiplus_la_SOURCES = $(libgvplugin_gdiplus_C_la_SOURCES)
-libgvplugin_gdiplus_la_LIBADD = -lgdi32 -lole32 -lstdc++ -luuid $(top_builddir)/lib/gvc/libgvc.la
+libgvplugin_gdiplus_la_LIBADD = -lgdi32 -lole32 -luuid $(top_builddir)/lib/gvc/libgvc.la
 
 if WITH_WIN32
 libgvplugin_gdiplus_la_LDFLAGS += -no-undefined
-- 
2.40.0