Upstream-Status: Pending

Using uname like this when cross compiling is a really bad idea. We 
provide the correct linker flags, lets just assume we can get this 
right ourselves.

RP 2012/04/26

Index: Mesa-7.11/bin/mklib
===================================================================
--- Mesa-7.11.orig/bin/mklib	2012-04-26 19:43:20.729150109 +0000
+++ Mesa-7.11/bin/mklib	2012-04-26 20:30:22.421086163 +0000
@@ -330,13 +330,7 @@
 	    ;;
 	    esac
 
-	    # Check if objects are 32-bit and we're running in 64-bit
-	    # environment.  If so, pass -m32 flag to linker.
 	    set ${OBJECTS}
-	    ABI32=`file $1 | grep 32-bit`
-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
-		OPTS="-m32 ${OPTS}"
-	    fi
 
             if [ "${ALTOPTS}" ] ; then
                 OPTS=${ALTOPTS}
@@ -387,13 +381,7 @@
 		# exptmp is removed below
 	    fi
 
-	    # Check if objects are 32-bit and we're running in 64-bit
-	    # environment.  If so, pass -m32 flag to linker.
 	    set ${OBJECTS}
-	    ABI32=`file $1 | grep 32-bit`
-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
-		OPTS="-m32 ${OPTS}"
-	    fi
             if [ "${ALTOPTS}" ] ; then
                 OPTS=${ALTOPTS}
             fi