diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-02-03 16:57:54 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-03-20 15:50:22 +0100 |
| commit | 99718ef1734c0db06034127da703f70a1c30f1a3 (patch) | |
| tree | 00e8b8553c6acfd48be8e597786e39ddc0257880 | |
| parent | b51e404d3be18b9b1e39e6e3548eed9ddb586ea7 (diff) | |
| download | astra-99718ef1734c0db06034127da703f70a1c30f1a3.tar.gz astra-99718ef1734c0db06034127da703f70a1c30f1a3.tar.bz2 astra-99718ef1734c0db06034127da703f70a1c30f1a3.tar.xz astra-99718ef1734c0db06034127da703f70a1c30f1a3.zip | |
Disable openmp on macOS
| -rw-r--r-- | build/linux/Makefile.in | 3 | ||||
| -rw-r--r-- | build/linux/configure.ac | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 9066f0a..ae3dec8 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -4,6 +4,7 @@ cuda=@HAVECUDA@ matlab=@HAVEMATLAB@ python=@HAVEPYTHON@ boostutf=@HAVEBOOSTUTF@ +macos=@IS_MACOS@ MATLAB_ROOT=@MATLAB_ROOT@ octave=@HAVEOCTAVE@ @@ -64,9 +65,11 @@ endif ifeq ($(matlab),yes) # TODO: Do we also want -fopenmp for octave? CPPFLAGS+=-I$(MATLAB_ROOT)/extern/include -DMATLAB_MEX_FILE +ifeq ($(macos),no) CXXFLAGS+=-fopenmp LDFLAGS+=-fopenmp endif +endif # MODLDFLAGS are the base LDFLAGS for matlab, octave, python modules MODLDFLAGS=$(LDFLAGS) -L$(abs_top_builddir)/.libs diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 43cb1a8..813b462 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -251,13 +251,16 @@ AC_CANONICAL_HOST case $host_os in darwin* ) CPPFLAGS_OS="-stdlib=libstdc++ -mmacosx-version-min=10.6" + IS_MACOS=yes ;; *) CPPFLAGS_OS="" + IS_MACOS=no ;; esac AC_SUBST(CPPFLAGS_OS) +AC_SUBST(IS_MACOS) # For some reason, some older versions of autoconf produce a config.status # that disables all lines looking like VPATH=@srcdir@ |