texlive[56849] Master/tlpkg/installer/config.guess: revert musl
commits+karl at tug.org
commits+karl at tug.org
Tue Nov 3 23:43:58 CET 2020
Revision: 56849
http://tug.org/svn/texlive?view=revision&revision=56849
Author: karl
Date: 2020-11-03 23:43:56 +0100 (Tue, 03 Nov 2020)
Log Message:
-----------
revert musl changes, back to 2020-08-17 version for Xu
Modified Paths:
--------------
trunk/Master/tlpkg/installer/config.guess
Modified: trunk/Master/tlpkg/installer/config.guess
===================================================================
--- trunk/Master/tlpkg/installer/config.guess 2020-11-03 22:18:24 UTC (rev 56848)
+++ trunk/Master/tlpkg/installer/config.guess 2020-11-03 22:43:56 UTC (rev 56849)
@@ -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 @@
#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 @@
"/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 ;;
More information about the tex-live-commits
mailing list.