Ver código fonte

move -lcufft to its own STARPU_CUFFT_LDFLAGS variable

Samuel Thibault 14 anos atrás
pai
commit
6f51eb3371
2 arquivos alterados com 5 adições e 3 exclusões
  1. 3 1
      configure.ac
  2. 2 2
      examples/starpufft/Makefile.am

+ 3 - 1
configure.ac

@@ -380,7 +380,8 @@ if test x$enable_cuda = xyes; then
 #		*-*darwin*) AC_HAVE_LIBRARY([stdc++], []) ;;
 #		#*-*darwin*) AC_HAVE_LIBRARY([stdc++], [STARPU_CUDA_LDFLAGS="$STARPU_CUDA_LDFLAGS -lstdc++"]) ;;
 #	esac
-	STARPU_CUDA_LDFLAGS="$STARPU_CUDA_LDFLAGS -lcuda -lcufft"
+	STARPU_CUDA_LDFLAGS="$STARPU_CUDA_LDFLAGS -lcuda"
+	STARPU_CUFFT_LDFLAGS="-lcufft"
 
         if test "$F77" = "gfortran" ; then
             STARPU_CUDA_LDFLAGS="$STARPU_CUDA_LDFLAGS -lgfortran"
@@ -500,6 +501,7 @@ fi
 if test x$enable_cuda = xyes; then
     STARPU_CUDA_LDFLAGS="$STARPU_CUDA_LDFLAGS -lstdc++"
     AC_SUBST(STARPU_CUDA_LDFLAGS)
+    AC_SUBST(STARPU_CUFFT_LDFLAGS)
     AC_SUBST(STARPU_CUDA_CPPFLAGS)
 fi
 

+ 2 - 2
examples/starpufft/Makefile.am

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009, 2010  Université de Bordeaux 1
+# Copyright (C) 2009-2011  Université de Bordeaux 1
 # Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_builddir)/include $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS)
-AM_LDFLAGS = $(STARPU_CUDA_LDFLAGS) $(STARPU_OPENCL_LDFLAGS)
+AM_LDFLAGS = $(STARPU_CUDA_LDFLAGS) $(STARPU_OPENCL_LDFLAGS) $(STARPU_CUFFT_LDFLAGS)
 
 lib_LTLIBRARIES = libstarpufft.la