|
2 | 2 | # Attempt to guess a canonical system name.
|
3 | 3 | # Copyright 1992-2018 Free Software Foundation, Inc.
|
4 | 4 |
|
5 |
| -timestamp='2018-01-26' |
| 5 | +timestamp='2018-07-06' |
6 | 6 |
|
7 | 7 | # This file is free software; you can redistribute it and/or modify it
|
8 | 8 | # under the terms of the GNU General Public License as published by
|
@@ -101,12 +101,12 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && e
|
101 | 101 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
102 | 102 | : ${TMPDIR=/tmp} ;
|
103 | 103 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
104 |
| - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || |
105 |
| - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || |
| 104 | + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp 2>/dev/null) ; } || |
| 105 | + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || |
106 | 106 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
107 | 107 | dummy=$tmp/dummy ;
|
108 | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
|
109 |
| -case $CC_FOR_BUILD,$HOST_CC,$CC in |
| 109 | +case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in |
110 | 110 | ,,) echo "int x;" > "$dummy.c" ;
|
111 | 111 | for c in cc gcc c89 c99 ; do
|
112 | 112 | if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
|
@@ -237,7 +237,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
|
237 | 237 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
|
238 | 238 | # contains redundant information, the shorter form:
|
239 | 239 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
|
240 |
| - echo "$machine-${os}${release}${abi}" |
| 240 | + echo "$machine-${os}${release}${abi-}" |
241 | 241 | exit ;;
|
242 | 242 | *:Bitrig:*:*)
|
243 | 243 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
|
|
894 | 894 | # other systems with GNU libc and userland
|
895 | 895 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
|
896 | 896 | exit ;;
|
897 |
| - i*86:Minix:*:*) |
898 |
| - echo "$UNAME_MACHINE"-pc-minix |
| 897 | + *:Minix:*:*) |
| 898 | + echo "$UNAME_MACHINE"-unknown-minix |
899 | 899 | exit ;;
|
900 | 900 | aarch64:Linux:*:*)
|
901 | 901 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
|
@@ -1469,7 +1469,7 @@ EOF
|
1469 | 1469 | exit 1
|
1470 | 1470 |
|
1471 | 1471 | # Local variables:
|
1472 |
| -# eval: (add-hook 'write-file-functions 'time-stamp) |
| 1472 | +# eval: (add-hook 'before-save-hook 'time-stamp) |
1473 | 1473 | # time-stamp-start: "timestamp='"
|
1474 | 1474 | # time-stamp-format: "%:y-%02m-%02d"
|
1475 | 1475 | # time-stamp-end: "'"
|
|
0 commit comments