summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2009-10-07 14:03:08 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2009-10-07 14:03:08 +0000
commit411922b7bae8425aad349f773877edf648076059 (patch)
treeb9eb74c1b46ce0458a9dc6e57870fd3ceeac2fc1 /sys-devel/llvm
parentrm (diff)
downloadgentoo-2-411922b7bae8425aad349f773877edf648076059.tar.gz
gentoo-2-411922b7bae8425aad349f773877edf648076059.tar.bz2
gentoo-2-411922b7bae8425aad349f773877edf648076059.zip
Fix llvm-gcc location, work with
(Portage version: 2.2_rc44/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/llvm')
-rw-r--r--sys-devel/llvm/ChangeLog5
-rw-r--r--sys-devel/llvm/llvm-2.6_pre2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 5f88805934e2..2bf1786af2bd 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-devel/llvm
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.1 2009/10/05 13:10:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.2 2009/10/07 14:03:08 voyageur Exp $
+
+ 07 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.6_pre2.ebuild:
+ Fix llvm-gcc location, work with
*llvm-2.6_pre2 (05 Oct 2009)
diff --git a/sys-devel/llvm/llvm-2.6_pre2.ebuild b/sys-devel/llvm/llvm-2.6_pre2.ebuild
index e52afb23b211..c97c73b6508d 100644
--- a/sys-devel/llvm/llvm-2.6_pre2.ebuild
+++ b/sys-devel/llvm/llvm-2.6_pre2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6_pre2.ebuild,v 1.1 2009/10/05 13:10:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6_pre2.ebuild,v 1.2 2009/10/07 14:03:08 voyageur Exp $
EAPI="2"
inherit eutils multilib toolchain-funcs
@@ -118,7 +118,7 @@ src_configure() {
local LLVM_GCC_DIR=/dev/null
local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
if use llvm-gcc ; then
- LLVM_GCC_DIR=$(find /usr/$(get_libdir)/llvm-gcc/ -mindepth 1 -maxdepth 1 2> /dev/null)
+ LLVM_GCC_DIR=$(ls -d ${ROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
if [[ -z ${LLVM_GCC_DRIVER} ]] ; then