diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-30 09:15:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-05-30 09:16:28 -0700 |
| commit | ebcc70ab1be968a9d98eaa7cf6a51421ff8ea62f (patch) | |
| tree | cfe1d8550be03f2fc9e630ac58dafef1aaf24162 /build-aux | |
| parent | 412c38aa28dd7e8363b481a09d1df62c40f9a5b7 (diff) | |
| download | emacs-ebcc70ab1be968a9d98eaa7cf6a51421ff8ea62f.tar.gz | |
Merge from gnulib
* build-aux/config.guess: Copy from gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/config.guess | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess index faa63aa9429..2193702b12a 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2017-05-11' +timestamp='2017-05-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1304,14 +1304,21 @@ EOF if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub |