From: Jeremy Huddleston <jeremy@vincent.local>
Date: Mon, 21 Dec 2009 05:34:27 +0000 (-0800)
Subject: darwin: mklib: Use lipo rather than file to figure out architectures of object files
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b96a5df5141390b5cb31c0eac6449239c6cb750e;p=mesa.git

darwin: mklib: Use lipo rather than file to figure out architectures of object files
(cherry picked from commit ad7f9d71e22fb7667c90dbbc0558939b89a45154)
---

diff --git a/bin/mklib b/bin/mklib
index db97087c0a6..3bec160b40c 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -724,22 +724,10 @@ case $ARCH in
 
 	    # examine first object to determine ABI
     	    set ${OBJECTS}
-            ABI_PPC=`file $1 | grep ' ppc'`
-            ABI_I386=`file $1 | grep ' i386'`
-            ABI_PPC64=`file $1 | grep ' ppc64'`
-            ABI_X86_64=`file $1 | grep ' x86_64'`
-            if [ "${ABI_PPC}" ] ; then
-                OPTS="${OPTS} -arch ppc"
-            fi
-            if [ "${ABI_I386}" ] ; then
-                OPTS="${OPTS} -arch i386"
-            fi
-            if [ "${ABI_PPC64}" ] ; then
-                OPTS="${OPTS} -arch ppc64"
-            fi
-            if [ "${ABI_X86_64}" ] ; then
-                OPTS="${OPTS} -arch x86_64"
-            fi
+            ABIS=`lipo -info $1 | sed s/.*://`
+            for ABI in $ABIS; do
+                OPTS="${OPTS} -arch ${ABI}"
+            done
 
             if [ "${ALTOPTS}" ] ; then
                 OPTS=${ALTOPTS}