# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1338569084 -7200
# Node ID 175bd828c3324ad7011349c3aeff910c769ab452
# Parent  e0aecd9c55e99bf454b5b050c45937390f32e5e8
cross: glibc create lib64 lib symlinks (that fix GCC final build)

diff -r e0aecd9c55e9 -r 175bd828c332 cross
--- a/cross	Thu May 31 15:37:15 2012 +0200
+++ b/cross	Fri Jun 01 18:44:44 2012 +0200
@@ -155,16 +155,6 @@
 	echo "Extracting: $GCC_TARBALL"
 	tar xjf $SRC/$GCC_TARBALL
 	echo "Configure: $GCC_STATIC_ARGS"
-	# Arch fixes and work around
-	case "$ARCH" in
-		x86_64)
-			# GCC wants Glib headers in cross environment (not tested
-			# with sysroot) Should we install glibc-headers before ?
-			echo "Try with eglibc or install glibc-headers first"
-			#rm -f $tools/$TARGET/include
-			#ln -s /usr/include $tools/$TARGET/include
-			;;
-	esac
 	rm -rf gcc-static
 	mkdir gcc-static && cd gcc-static
 	../gcc-$GCC_VERSION/configure \
@@ -232,9 +222,13 @@
 		$GLIBC_ARGS &&
 	make || exit 1
 	make install_root=$sysroot install
-	# Work around to let GCC find Glibc headers.
-	#cd $sysroot
-	#ln -s usr/include sys-include
+	# Symlink lib64 to lib
+	case "$ARCH" in
+		x86_64)
+			rm -f $sysroot/lib $sysroot/usr/lib
+			cd $sysroot && ln -s lib64 lib
+			cd usr && ln -s lib64 lib ;;
+	esac
 	echo "cross: glibc compiled on: $(date)"
 }