# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1519308861 -7200
# Node ID b6cd631e03f6b91bf03d4b90689e5a0565ed1d38
# Parent  2b85adc52ed3b2cb81db3eb1a25a96c524d7c73b
glibc: try to fix it again

diff -r 2b85adc52ed3 -r b6cd631e03f6 glibc/receipt
--- a/glibc/receipt	Thu Feb 22 15:24:46 2018 +0200
+++ b/glibc/receipt	Thu Feb 22 16:14:21 2018 +0200
@@ -74,9 +74,9 @@
 	# Read the INSTALL file in glibc. Also Glibc don't build with -Os flag.
 	unset CFLAGS CXXFLAGS
 	case $ARCH in
-		i386)   Arch='i486';;
-		x86_64) Arch='nocona';;
-		*)      Arch="$ARCH";;
+		i?86)   Arch='i486';   ARCH_ARGS='-m32';;
+		x86_64) Arch='nocona'; ARCH_ARGS='-m64';;
+		*)      Arch="$ARCH";  ARCH_ARGS='';;
 	esac
 	echo "CFLAGS += -O2 -march=$Arch -mtune=$Arch" > configparms
 
@@ -89,7 +89,7 @@
 	# put the exact or lower numbers. From Glibc INSTALL:
 	# > The higher the VERSION number is, the less compatibility code is
 	# > added, and the faster the code gets.
-	CC="gcc -isystem /usr/lib/gcc/$BUILD_SYSTEM/$(. $WOK/gcc/receipt; echo $VERSION)/include \
+	CC="gcc $ARCH_ARGS -isystem /usr/lib/gcc/$BUILD_SYSTEM/$(. $WOK/gcc/receipt; echo $VERSION)/include \
 	-isystem /usr/include" \
 	../configure \
 		--disable-werror \