gnu/config
1
0
Fork 0
mirror of git://git.savannah.gnu.org/config.git synced 2025-05-26 09:06:38 +12:00
Code Issues Packages Projects Releases Wiki Activity

* config.guess: Disable SC2154 and SC2172 Shellcheck warnings.

Browse Source 
* Makefile (shellcheck): Don't disable SC2172 globally.
This commit is contained in:
Ben Elliston 2018-07-13 21:37:46 +10:00
parent 30d53fc428
commit a4b36a6939
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-07-13 Ben Elliston <bje@gnu.org>
* config.guess: Disable SC2154 and SC2172 Shellcheck warnings.
* Makefile (shellcheck): Don't disable SC2172 globally.
2018-07-13 John Ericson <john.ericson@obsidian.systems>
* config.sub: Don't recognize every *-unknown as a basic_machine.

2
Makefile
View File

@ -17,4 +17,4 @@ check-sub:
cd testsuite && sh config-sub.sh
shellcheck:
shellcheck -e SC2006,SC2039,SC2172 -f gcc config.guess config.sub testsuite/*.sh
shellcheck -e SC2006,SC2039 -f gcc config.guess config.sub testsuite/*.sh

4
config.guess vendored
View File

@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2018-07-12'
timestamp='2018-07-13'
# 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
@ -95,6 +95,7 @@ fi
# Portable tmp directory creation inspired by the Autoconf team.
tmp=
# shellcheck disable=SC2172
trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
@ -1359,6 +1360,7 @@ EOF
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
# shellcheck disable=SC2154
if test "$cputype" = 386; then
UNAME_MACHINE=i386
else