diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-03-20 15:52:37 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-03-20 15:52:37 +0100 |
| commit | 53eea5892cd1d51f802533adb9ea94e04b4ce86b (patch) | |
| tree | b6875f0aab543e1551c58bfe12d630717894284c /build/linux/configure.ac | |
| parent | 4d0d9ca396378813f8559f479ff9a64b0881a627 (diff) | |
| parent | cd32957185094680b84014e1ea8411ce6b142f74 (diff) | |
| download | astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.gz astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.bz2 astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.xz astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.zip | |
Merge branch 'macOS'
Diffstat (limited to 'build/linux/configure.ac')
| -rw-r--r-- | build/linux/configure.ac | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 46c84a5..b95d94f 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -102,14 +102,7 @@ if test x"$NVCC" != xno; then HAVECUDA=yes BACKUP_CUDA_LDFLAGS="$LDFLAGS" if test x"$with_cuda" != x -a x"$with_cuda" != xyes; then - case $host_cpu in - x86_64) - LDFLAGS_CUDA="-L$with_cuda/lib64" - ;; - *) - LDFLAGS_CUDA="-L$with_cuda/lib" - ;; - esac + test -d $with_cuda/lib64 && LDFLAGS_CUDA="-L$with_cuda/lib64" || LDFLAGS_CUDA="-L$with_cuda/lib" CPPFLAGS_CUDA="-I$with_cuda/include" LDFLAGS="$LDFLAGS $LDFLAGS_CUDA" fi @@ -257,14 +250,20 @@ 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 # that disables all lines looking like VPATH=@srcdir@ |