diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2010-03-12 19:03:41 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2010-03-12 19:04:19 -0800 |
| commit | 5d66fc6e3a78f3ebdbeac647a786063293750abb (patch) | |
| tree | 691d3f80ef3171fe94e57bbd5819a51bbfb717d2 /bin | |
| parent | 2764a5191ffcaf93a77beff464ac8eca15163fcc (diff) | |
| download | external_mesa3d-5d66fc6e3a78f3ebdbeac647a786063293750abb.zip external_mesa3d-5d66fc6e3a78f3ebdbeac647a786063293750abb.tar.gz external_mesa3d-5d66fc6e3a78f3ebdbeac647a786063293750abb.tar.bz2 | |
mklib: Fix amd64 builds on Solaris when using Sun compilers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/mklib | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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 |