Use tc-export to enforce Gentoo default CC/CXX when $CHOST-clang is available.

(Portage version: 2.2.0_alpha120_p6/cvs/Linux x86_64)

4 files changed, 17 insertions, 4 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 276d722d66b6..be7c408ac910 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.88 2012/07/16 09:31:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.89 2012/07/27 18:20:47 mgorny Exp $
+
+  27 Jul 2012; Michał Górny <mgorny@gentoo.org> llvm-3.1-r1.ebuild,
+  llvm-3.1-r2.ebuild, llvm-9999.ebuild:
+  Use tc-export to enforce Gentoo default CC/CXX when $CHOST-clang is available.
 
 *llvm-3.1-r2 (16 Jul 2012)
 
diff --git a/sys-devel/llvm/llvm-3.1-r1.ebuild b/sys-devel/llvm/llvm-3.1-r1.ebuild
index bcaa00883dd7..ca0755b702cb 100644
--- a/sys-devel/llvm/llvm-3.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r1.ebuild,v 1.2 2012/07/06 07:19:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r1.ebuild,v 1.3 2012/07/27 18:20:47 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -138,6 +138,9 @@ src_configure() {
 		append-cppflags "$(pkg-config --cflags libffi)"
 	fi
 	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
+
+	# llvm prefers clang over gcc, so we may need to force that
+	tc-export CC CXX
 	econf ${CONF_FLAGS}
 }
 
diff --git a/sys-devel/llvm/llvm-3.1-r2.ebuild b/sys-devel/llvm/llvm-3.1-r2.ebuild
index 158df203890f..2fae217beb2d 100644
--- a/sys-devel/llvm/llvm-3.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r2.ebuild,v 1.1 2012/07/16 09:31:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r2.ebuild,v 1.2 2012/07/27 18:20:47 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -141,6 +141,9 @@ src_configure() {
 		append-cppflags "$(pkg-config --cflags libffi)"
 	fi
 	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
+
+	# llvm prefers clang over gcc, so we may need to force that
+	tc-export CC CXX
 	econf ${CONF_FLAGS}
 }
 
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 4131fd5500e3..0814aec0cf82 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.34 2012/07/03 14:32:17 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.35 2012/07/27 18:20:47 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -135,6 +135,9 @@ src_configure() {
 		append-cppflags "$(pkg-config --cflags libffi)"
 	fi
 	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
+
+	# llvm prefers clang over gcc, so we may need to force that
+	tc-export CC CXX
 	econf ${CONF_FLAGS}
 }