From f5c25084f09a8f35c4e3d01eb84de984778ae8a9 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 3 Feb 2017 16:58:56 +0100
Subject: Set stdlib to libstdc++ on macOS consistently

---
 build/linux/configure.ac | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'build/linux/configure.ac')

diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 813b462..b95d94f 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -250,16 +250,19 @@ AC_SUBST(HAVEPYTHON)
 AC_CANONICAL_HOST
 case $host_os in
   darwin* )
-        CPPFLAGS_OS="-stdlib=libstdc++ -mmacosx-version-min=10.6"
+        CXXFLAGS_OS="-stdlib=libstdc++ -mmacosx-version-min=10.6"
+        LDFLAGS_OS="-stdlib=libstdc++"
         IS_MACOS=yes
         ;;
     *)
-        CPPFLAGS_OS=""
+        CXXFLAGS_OS=""
+        LDFLAGS_OS=""
         IS_MACOS=no
         ;;
 esac
 
-AC_SUBST(CPPFLAGS_OS)
+AC_SUBST(CXXFLAGS_OS)
+AC_SUBST(LDFLAGS_OS)
 AC_SUBST(IS_MACOS)
 
 # For some reason, some older versions of autoconf produce a config.status
-- 
cgit v1.2.3