From e88ff47423d3288319ff7b61cb70955a82e0e5ea Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Sun, 1 Jul 2012 05:41:23 -0600
Subject: [PATCH] glibc: don't munge cflags into configparams for i686

---
 srcpkgs/glibc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 4a69a0479e..6b46969614 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.16.0
-revision=2
+revision=3
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"
@@ -31,8 +31,7 @@ do_configure() {
 	# Build with -mno-tls-direct-seg-refs to avoid performance problems
 	# with Xen on x86 32bit.
 	if [ "${XBPS_MACHINE}" = "i686" ]; then
-		cflags="-mno-tls-direct-seg-refs -O2 -march=${XBPS_MACHINE%%-*}"
-		echo "CFLAGS=$cflags" >> configparms
+		export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
 	fi
 
 	../configure ${CONFIGURE_SHARED_ARGS} --with-tls \