diff options
author | Jeremy Huddleston <jeremy@vincent.local> | 2009-12-20 21:34:27 -0800 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-12-20 21:36:41 -0800 |
commit | b96a5df5141390b5cb31c0eac6449239c6cb750e (patch) | |
tree | 0990d47f74de7be6b44eae5626497af212c9837f | |
parent | f926eff263739183b2f0dd8aca32015625eb4b4c (diff) | |
download | mesa-b96a5df5141390b5cb31c0eac6449239c6cb750e.tar.gz |
darwin: mklib: Use lipo rather than file to figure out architectures of object files
(cherry picked from commit ad7f9d71e22fb7667c90dbbc0558939b89a45154)
-rwxr-xr-x | bin/mklib | 20 |
1 files changed, 4 insertions, 16 deletions
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} |