4 files changed, 16 insertions, 12 deletions
diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index d1b1cf315238..f14d28c02b3a 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.48 2011/04/08 09:13:52 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.49 2011/06/10 20:51:06 idl0r Exp $
+
+  10 Jun 2011; Christian Ruppert <idl0r@gentoo.org> haproxy-1.3.25.ebuild,
+  haproxy-1.4.8.ebuild, haproxy-1.4.15.ebuild:
+  Build with CC=$(tc-getCC), bug 369575.
 
 *haproxy-1.4.15 (08 Apr 2011)
 
diff --git a/net-proxy/haproxy/haproxy-1.3.25.ebuild b/net-proxy/haproxy/haproxy-1.3.25.ebuild
index a88f3991c2f4..e8a8329c53f6 100644
--- a/net-proxy/haproxy/haproxy-1.3.25.ebuild
+++ b/net-proxy/haproxy/haproxy-1.3.25.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.25.ebuild,v 1.4 2010/10/24 14:50:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.25.ebuild,v 1.5 2011/06/10 20:51:06 idl0r Exp $
 
-inherit eutils versionator
+inherit eutils versionator toolchain-funcs
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -29,7 +29,7 @@ src_compile() {
 	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
 	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
 
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${args} || die
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
 src_install() {
diff --git a/net-proxy/haproxy/haproxy-1.4.15.ebuild b/net-proxy/haproxy/haproxy-1.4.15.ebuild
index 005351a16ac4..03b2b8c18aeb 100644
--- a/net-proxy/haproxy/haproxy-1.4.15.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.15.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.15.ebuild,v 1.1 2011/04/08 09:13:52 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.15.ebuild,v 1.2 2011/06/10 20:51:06 idl0r Exp $
 
 EAPI="3"
 
-inherit eutils versionator
+inherit eutils versionator toolchain-funcs
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -31,7 +31,7 @@ src_compile() {
 	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
 	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
 
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${args} || die
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
 src_install() {
diff --git a/net-proxy/haproxy/haproxy-1.4.8.ebuild b/net-proxy/haproxy/haproxy-1.4.8.ebuild
index c5dab10f8f79..e32449a4c65d 100644
--- a/net-proxy/haproxy/haproxy-1.4.8.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.8.ebuild,v 1.4 2010/10/24 14:50:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.8.ebuild,v 1.5 2011/06/10 20:51:06 idl0r Exp $
 
-inherit eutils versionator
+inherit eutils versionator toolchain-funcs
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -29,7 +29,7 @@ src_compile() {
 	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
 	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
 
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${args} || die
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
 src_install() {