Module: Mesa Branch: master Commit: 5d66fc6e3a78f3ebdbeac647a786063293750abb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d66fc6e3a78f3ebdbeac647a786063293750abb
Author: Alan Coopersmith <[email protected]> Date: Fri Mar 12 19:03:41 2010 -0800 mklib: Fix amd64 builds on Solaris when using Sun compilers Signed-off-by: Alan Coopersmith <[email protected]> --- bin/mklib | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/mklib b/bin/mklib index 08ef99e..c2760e5 100755 --- a/bin/mklib +++ b/bin/mklib @@ -494,13 +494,16 @@ case $ARCH in OPTS="${OPTS} -Wl,-Mmapfile.scope" fi - # Check if objects are SPARC v9 + # Check if objects are 64-bit # file says: ELF 64-bit MSB relocatable SPARCV9 Version 1 set ${OBJECTS} if [ ${LINK} = "cc" -o ${LINK} = "CC" ] ; then - SPARCV9=`file $1 | grep SPARCV9` - if [ "${SPARCV9}" ] ; then - OPTS="${OPTS} -xarch=v9" + ABI64=`file $1 | grep "ELF 64-bit"` + if [ "${ABI64}" ] ; then + case `uname -p` in + sparc) OPTS="${OPTS} -xarch=v9" ;; + i386) OPTS="${OPTS} -xarch=amd64" ;; + esac fi fi if [ "${ALTOPTS}" ] ; then _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
