diff options
author | Matt A. Tobin <email@mattatobin.com> | 2020-04-07 21:18:31 -0400 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2020-04-07 21:18:31 -0400 |
commit | 2383a02b59a11e248f86b361be4a675e8682ba1b (patch) | |
tree | c8095e206c710922bc034819a5908c4e8f8b6546 | |
parent | 33b22f6157410db00249d1161810476dca485c4f (diff) | |
download | UXP-2383a02b59a11e248f86b361be4a675e8682ba1b.tar UXP-2383a02b59a11e248f86b361be4a675e8682ba1b.tar.gz UXP-2383a02b59a11e248f86b361be4a675e8682ba1b.tar.lz UXP-2383a02b59a11e248f86b361be4a675e8682ba1b.tar.xz UXP-2383a02b59a11e248f86b361be4a675e8682ba1b.zip |
Alter config.guess to properly detect host and target bitness on SunOS
-rwxr-xr-x | build/autoconf/config.guess | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess index 28d509201..8fe758339 100755 --- a/build/autoconf/config.guess +++ b/build/autoconf/config.guess @@ -381,11 +381,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH=i386 - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + _ISAINFO=`isainfo -k 2>/dev/null` + if [ "$_ISAINFO" = "amd64" ]; then + SUN_ARCH=x86_64 + elif [ "$CC_FOR_BUILD" != no_compiler_found ]; then + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then |