summaryrefslogtreecommitdiffstats
path: root/build/linux/acinclude.m4
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-01-18 17:48:37 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-01-18 17:48:37 +0100
commit29b0cdc83a048ed0bb25f52fd97e020a71e533c6 (patch)
tree57feed06e62fbe9758f1a46fb6c4b1b35442de7c /build/linux/acinclude.m4
parenta7ce7a296545a9361c496e906997c9b7b5d70875 (diff)
parent5773a3d779083bb3dba85106fbe9dc45aeb346ea (diff)
downloadastra-29b0cdc83a048ed0bb25f52fd97e020a71e533c6.tar.gz
astra-29b0cdc83a048ed0bb25f52fd97e020a71e533c6.tar.bz2
astra-29b0cdc83a048ed0bb25f52fd97e020a71e533c6.tar.xz
astra-29b0cdc83a048ed0bb25f52fd97e020a71e533c6.zip
Merge branch 'master'
Diffstat (limited to 'build/linux/acinclude.m4')
-rw-r--r--build/linux/acinclude.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/build/linux/acinclude.m4 b/build/linux/acinclude.m4
index e4b6de7..d6866c3 100644
--- a/build/linux/acinclude.m4
+++ b/build/linux/acinclude.m4
@@ -93,13 +93,13 @@ int main() {
}
_ACEOF
$1="yes"
-ASTRA_RUN_STOREOUTPUT([$NVCC -c -o conftest.o conftest.cu $$2],conftest.nvcc.out) || {
+ASTRA_RUN_STOREOUTPUT([$NVCC -c -o conftest.o conftest.cu $NVCCFLAGS $$2],conftest.nvcc.out) || {
$1="no"
# Check if hack for gcc 4.4 helps
if grep -q __builtin_stdarg_start conftest.nvcc.out; then
AS_ECHO(["$as_me:${as_lineno-$LINENO}: Trying CUDA hack for gcc 4.4"]) >&AS_MESSAGE_LOG_FD
NVCC_OPT="-Xcompiler -D__builtin_stdarg_start=__builtin_va_start"
- ASTRA_RUN_LOGOUTPUT([$NVCC -c -o conftest.o conftest.cu $$2 $NVCC_OPT]) && {
+ ASTRA_RUN_LOGOUTPUT([$NVCC -c -o conftest.o conftest.cu $NVCCFLAGS $$2 $NVCC_OPT]) && {
$1="yes"
$2="$$2 $NVCC_OPT"
}
@@ -133,7 +133,7 @@ IFS=,
for arch in $1; do
IFS=$astra_save_IFS
NVCC_opt="-gencode=arch=compute_$arch,code=sm_$arch"
- $NVCC -c -o conftest.o conftest.cu $$2 $NVCC_opt >conftest.nvcc.out 2>&1 && {
+ $NVCC -c -o conftest.o conftest.cu $NVCCFLAGS $$2 $NVCC_opt >conftest.nvcc.out 2>&1 && {
NVCC_lastarch=$arch
NVCC_extra="$NVCC_extra $NVCC_opt"
NVCC_list="${NVCC_list:+$NVCC_list, }$arch"