diff options
| author | Karl Berry <karl@freefriends.org> | 2020-11-03 22:43:56 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-11-03 22:43:56 +0000 |
| commit | df302a58dbe72da442046dd33e8dda932618b78e (patch) | |
| tree | 1b411af3957c4bd29db98ca9c43a868c0d7cb422 | |
| parent | 3718b1f6d56dd8847711717b7f5e54d471d601e9 (diff) | |
revert musl changes, back to 2020-08-17 version for Xu
git-svn-id: svn://tug.org/texlive/trunk@56849 c570f23f-e606-0410-a88d-b1316a301751
| -rwxr-xr-x | Master/tlpkg/installer/config.guess | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Master/tlpkg/installer/config.guess b/Master/tlpkg/installer/config.guess index 12dd5b4245c..9aff91cfd03 100755 --- a/Master/tlpkg/installer/config.guess +++ b/Master/tlpkg/installer/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2020-10-22' +timestamp='2020-08-17' # 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 @@ -150,15 +150,17 @@ Linux|GNU|GNU/*) #elif defined(__dietlibc__) LIBC=dietlibc #else - #include <stdarg.h> - #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'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac @@ -182,7 +184,6 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` case "$UNAME_MACHINE_ARCH" in - aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; |