diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2020-12-01 07:05:31 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2020-12-01 07:05:31 +0200 |
| commit | 2d10a67c0edc9170ce20d4cefe6806ef01d8a45f (patch) | |
| tree | 39fd5b69b980250a4d4d4fa5f515709edb8541d8 /build-aux/config.guess | |
| parent | feb44888085d1b08f5267675ab112a7385b7e6f0 (diff) | |
| parent | faa1e5bb0c435a1ec4775a7ab9e42c3ba9e290af (diff) | |
| download | egawk-2d10a67c0edc9170ce20d4cefe6806ef01d8a45f.tar.gz egawk-2d10a67c0edc9170ce20d4cefe6806ef01d8a45f.tar.bz2 egawk-2d10a67c0edc9170ce20d4cefe6806ef01d8a45f.zip | |
Merge branch 'gawk-5.1-stable'
Diffstat (limited to 'build-aux/config.guess')
| -rwxr-xr-x | build-aux/config.guess | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess index 0fc11edb..699b3a10 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2020-11-07' +timestamp='2020-11-19' # 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 @@ -27,7 +27,7 @@ timestamp='2020-11-07' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to <config-patches@gnu.org>. @@ -138,9 +138,7 @@ UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -149,16 +147,30 @@ Linux|GNU|GNU/*) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc + #elif defined(__GLIBC__) + LIBC=gnu #else #include <stdarg.h> + /* First heuristic to detect musl libc. */ #ifdef __DEFINED_va_list LIBC=musl - #else - LIBC=gnu #endif #endif EOF eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')" + + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi ;; esac @@ -1638,9 +1650,9 @@ This script (version $timestamp), has failed to recognize the operating system you are using. If your script is old, overwrite *all* copies of config.guess and config.sub with the latest versions from: - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess + https://git.savannah.gnu.org/cgit/config.git/plain/config.guess and - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + https://git.savannah.gnu.org/cgit/config.git/plain/config.sub EOF year=$(echo $timestamp | sed 's,-.*,,') |