diff options
| author | Daniel M. Pelt <d.m.pelt@cwi.nl> | 2015-03-05 12:22:52 +0100 |
|---|---|---|
| committer | Daniel M. Pelt <d.m.pelt@cwi.nl> | 2015-03-05 12:22:52 +0100 |
| commit | 8a1001f236cc0d31d24c250e6eb1f0cd1c419ebc (patch) | |
| tree | d048428e92c959bb7e448a6007bf4ac7a03978c1 | |
| parent | 20f329a7a38cd02586ef305d551d288ebcf39501 (diff) | |
| download | astra-8a1001f236cc0d31d24c250e6eb1f0cd1c419ebc.tar.gz astra-8a1001f236cc0d31d24c250e6eb1f0cd1c419ebc.tar.bz2 astra-8a1001f236cc0d31d24c250e6eb1f0cd1c419ebc.tar.xz astra-8a1001f236cc0d31d24c250e6eb1f0cd1c419ebc.zip | |
Force clang to use libstdc++ on OSX (fixes Cython compilation)
| -rw-r--r-- | build/linux/Makefile.in | 2 | ||||
| -rw-r--r-- | build/linux/configure.ac | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 92697b2..2d62a17 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -32,6 +32,8 @@ CXXFLAGS+=-g -O3 -Wall -Wshadow LIBS+=-lpthread LDFLAGS+=-g +CPPFLAGS+=@CPPFLAGS_OS@ + ifeq ($(cuda),yes) CPPFLAGS += @CPPFLAGS_CUDA@ -DASTRA_CUDA NVCCFLAGS = @NVCCFLAGS@ @CPPFLAGS_CUDA@ -I../.. -I../../include -DASTRA_CUDA diff --git a/build/linux/configure.ac b/build/linux/configure.ac index b97a7a0..129079c 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -208,6 +208,19 @@ fi AC_SUBST(HAVEPYTHON) +#OS specific setup +AC_CANONICAL_HOST +case $host_os in + darwin* ) + CPPFLAGS_OS="-stdlib=libstdc++ -mmacosx-version-min=10.6" + ;; + *) + CPPFLAGS_OS="" + ;; +esac + +AC_SUBST(CPPFLAGS_OS) + # TODO: |