From: Justin Lecher Date: Tue, 18 Nov 2014 19:44:02 +0000 (+0000) Subject: Fix gcc detection when using multislot, #529710 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf1d5c53540c6949fa393f57ca6b6b668a33d452;p=gentoo.git Fix gcc detection when using multislot, #529710 --- diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 4dbb11c556b3..33c309aad436 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.1426 2014/11/17 23:34:19 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1427 2014/11/18 19:44:02 jlec Exp $ + + 18 Nov 2014; Justin Lecher cuda.eclass: + Fix gcc detection when using multislot, #529710 17 Nov 2014; Andreas K. Huettel perl-module.eclass: Make calling fixlocalpod trigger a real warning diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass index 85989ffec1b5..3911f4886432 100644 --- a/eclass/cuda.eclass +++ b/eclass/cuda.eclass @@ -1,6 +1,6 @@ # 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.4 2014/09/17 10:21:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.5 2014/11/18 19:44:02 jlec Exp $ inherit flag-o-matic toolchain-funcs versionator @@ -71,7 +71,7 @@ cuda_gccdir() { fi for ver in ${args}; do - has_version sys-devel/gcc:${ver} && \ + has_version =sys-devel/gcc-${ver}* && \ gcc_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver}* | tail -n 1)" done