summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-04-07 21:18:31 -0400
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 13:25:29 +0200
commit049dae86d2000d375d1d823a5d9e4c009eb3afd3 (patch)
tree05bfb1f8e3815d7135aaec0908a15b3668d94fd4
parent65ba3cac582ca078ff5864310b3425e7c83a028e (diff)
downloadUXP-049dae86d2000d375d1d823a5d9e4c009eb3afd3.tar
UXP-049dae86d2000d375d1d823a5d9e4c009eb3afd3.tar.gz
UXP-049dae86d2000d375d1d823a5d9e4c009eb3afd3.tar.lz
UXP-049dae86d2000d375d1d823a5d9e4c009eb3afd3.tar.xz
UXP-049dae86d2000d375d1d823a5d9e4c009eb3afd3.zip
Alter config.guess to properly detect host and target bitness on SunOS
-rwxr-xr-xbuild/autoconf/config.guess13
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