summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-02-03 16:58:56 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-03-20 15:50:22 +0100
commitf5c25084f09a8f35c4e3d01eb84de984778ae8a9 (patch)
treeb9e8f839117192f2d46427e417899725f75de978
parenta3336fc3445fca283be97528d60f2f55501491b0 (diff)
downloadastra-f5c25084f09a8f35c4e3d01eb84de984778ae8a9.tar.gz
astra-f5c25084f09a8f35c4e3d01eb84de984778ae8a9.tar.bz2
astra-f5c25084f09a8f35c4e3d01eb84de984778ae8a9.tar.xz
astra-f5c25084f09a8f35c4e3d01eb84de984778ae8a9.zip
Set stdlib to libstdc++ on macOS consistently
-rw-r--r--build/linux/Makefile.in3
-rw-r--r--build/linux/configure.ac9
2 files changed, 8 insertions, 4 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 0120d60..1c0c56a 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -50,7 +50,8 @@ CXXFLAGS+=-g -O3 -Wall -Wshadow
LIBS+=-lpthread
LDFLAGS+=-g
-CPPFLAGS+=@CPPFLAGS_OS@
+CXXFLAGS+=@CXXFLAGS_OS@
+LDFLAGS+=@LDFLAGS_OS@
BOOSTUTF_LIBS=@LIBS_BOOSTUTF@
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