summaryrefslogtreecommitdiffstats
path: root/build/linux/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'build/linux/configure.ac')
-rw-r--r--build/linux/configure.ac9
1 files changed, 5 insertions, 4 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 85e4324..487a8cc 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -30,6 +30,7 @@ LT_INIT([disable-static])
SAVED_CPPFLAGS="$CPPFLAGS"
SAVED_CXXFLAGS="$CXXFLAGS"
+SAVED_NVCCFLAGS="$NVCCFLAGS"
SAVED_LDFLAGS="$LDFLAGS"
SAVED_LIBS="$LIBS"
@@ -124,10 +125,9 @@ if test x"$NVCC" != xno; then
AC_SUBST(NVCC)
fi
-NVCCFLAGS=""
if test x"$HAVECUDA" = xyes; then
AC_MSG_CHECKING([if nvcc works])
- ASTRA_CHECK_NVCC(HAVECUDA,NVCCFLAGS)
+ ASTRA_CHECK_NVCC(HAVECUDA,NVCCFLAGS_EXTRA)
AC_MSG_RESULT($HAVECUDA)
fi
@@ -138,7 +138,7 @@ if test x"$HAVECUDA" = xyes; then
if test x"$with_cuda_compute" = x; then
with_cuda_compute="10,12,20,30,35,50"
fi
- ASTRA_FIND_NVCC_ARCHS([$with_cuda_compute],NVCCFLAGS,NVCCARCHS)
+ ASTRA_FIND_NVCC_ARCHS([$with_cuda_compute],NVCCFLAGS_EXTRA,NVCCARCHS)
AC_MSG_RESULT([$NVCCARCHS])
fi
@@ -146,7 +146,7 @@ fi
AC_SUBST(HAVECUDA)
AC_SUBST(LDFLAGS_CUDA)
AC_SUBST(CPPFLAGS_CUDA)
-AC_SUBST(NVCCFLAGS)
+AC_SUBST(NVCCFLAGS_EXTRA)
# mex, matlab
@@ -249,6 +249,7 @@ AC_SUBST(CPPFLAGS_OS)
AC_SUBST(SAVED_CPPFLAGS)
AC_SUBST(SAVED_CXXFLAGS)
+AC_SUBST(SAVED_NVCCFLAGS)
AC_SUBST(SAVED_LDFLAGS)
AC_SUBST(SAVED_LIBS)
AC_CONFIG_FILES([Makefile])