Index: Makefile.in
--- Makefile.in.orig	2016-01-25 13:44:03.000000000 +0100
+++ Makefile.in	2016-03-27 13:20:29.527327002 +0200
@@ -123,13 +123,13 @@
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 poly_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) \
 	$(poly_LDFLAGS) $(LDFLAGS) -o $@
 am_polyimport_OBJECTS = polyimport.$(OBJEXT)
 polyimport_OBJECTS = $(am_polyimport_OBJECTS)
 polyimport_DEPENDENCIES = $(POLYRESOURCES) libpolyml/libpolyml.la
 polyimport_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) \
 	$(polyimport_LDFLAGS) $(LDFLAGS) -o $@
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
Index: configure
--- configure.orig	2016-01-25 13:44:03.000000000 +0100
+++ configure	2016-03-27 13:20:10.037334280 +0200
@@ -17515,7 +17515,6 @@
 #define HAVE_LIBGCC 1
 _ACEOF
 
-  LIBS="-lgcc $LIBS"
 
 fi
 
@@ -17554,7 +17553,6 @@
 #define HAVE_LIBGCC_S 1
 _ACEOF
 
-  LIBS="-lgcc_s $LIBS"
 
 fi
 
@@ -17593,7 +17591,6 @@
 #define HAVE_LIBSTDC__ 1
 _ACEOF
 
-  LIBS="-lstdc++ $LIBS"
 
 fi