diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-09-17 10:21:37 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-09-17 10:21:37 +0000 |
| commit | b94aab38f80693c2b233691550943d0f5263d439 (patch) | |
| tree | 688abb187428aaf6b2eb952f6e0c0b66ea2cf105 /eclass | |
| parent | Clean up patch. (diff) | |
| download | gentoo-2-b94aab38f80693c2b233691550943d0f5263d439.tar.gz gentoo-2-b94aab38f80693c2b233691550943d0f5263d439.tar.bz2 gentoo-2-b94aab38f80693c2b233691550943d0f5263d439.zip | |
nvcc always needs tp know the compiler location
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/cuda.eclass | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 852db4d5061d..fa697982f427 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1371 2014/09/16 17:49:57 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1372 2014/09/17 10:21:37 jlec Exp $ + + 17 Sep 2014; Justin Lecher <jlec@gentoo.org> cuda.eclass: + nvcc always needs tp know the compiler location 16 Sep 2014; Johannes Huber <johu@gentoo.org> kde4-base.eclass: Add kde-workspace 4.11.12 SRC_URI, remove obsolete. diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass index b3b80b26ef73..85989ffec1b5 100644 --- a/eclass/cuda.eclass +++ b/eclass/cuda.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.3 2013/08/11 16:20:23 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.4 2014/09/17 10:21:37 jlec Exp $ inherit flag-o-matic toolchain-funcs versionator @@ -101,9 +101,7 @@ cuda_sanitize() { [[ "${CUDA_VERBOSE}" == true ]] && NVCCFLAGS+=" -v" # Tell nvcc where to find a compatible compiler - if has_version \<=dev-util/nvidia-cuda-toolkit-5.5; then - NVCCFLAGS+=" $(cuda_gccdir -f)" - fi + NVCCFLAGS+=" $(cuda_gccdir -f)" # Tell nvcc which flags should be used for underlying C compiler NVCCFLAGS+=" --compiler-options=\"${CXXFLAGS}\" --linker-options=\"${rawldflags// /,}\"" |