diff options
author | Bruno Haible <bruno@clisp.org> | 2020-09-20 20:40:50 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2020-09-20 20:40:50 +0200 |
commit | 17a6bcd48f271a42880eb9657002de2a497a6a7e (patch) | |
tree | 2a363bd319b3bb33fca1cb33a0da904ca8e0df2d /m4/musl.m4 | |
parent | 197544f9ff63d8c29e2d28448761a48b6cdaa4c5 (diff) | |
download | gnulib-17a6bcd48f271a42880eb9657002de2a497a6a7e.tar.gz |
Revert now-unnecessary override of config.guess on Alpine Linux 3.10.
* m4/musl.m4: Revert 2020-09-19 patch.
* m4/setlocale_null.m4: Likewise.
* modules/setlocale-null: Likewise.
Diffstat (limited to 'm4/musl.m4')
-rw-r--r-- | m4/musl.m4 | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/m4/musl.m4 b/m4/musl.m4 index 343c71a7ce..d552cd781d 100644 --- a/m4/musl.m4 +++ b/m4/musl.m4 @@ -1,4 +1,4 @@ -# musl.m4 serial 2 +# musl.m4 serial 3 dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,40 +9,10 @@ dnl with or without modifications, as long as this notice is preserved. # <https://lists.gnu.org/archive/html/bug-gnulib/2018-02/msg00079.html>. # From Bruno Haible. -# There are three ways to test for musl libc: -# a. Look at the 'ldd --version' output. This is how config.guess -# does it. But it fails on Alpine Linux 3.10, because on this system -# 'ldd' is a shell script that does not understand the '--version' -# option. -# b. Test whether the header file <bits/alltypes.h> exists. -# c. Test whether the header file <stdarg.h> defines the macro -# __DEFINED_va_list. -# We use a+c. - AC_DEFUN_ONCE([gl_MUSL_LIBC], [ - AC_REQUIRE([gl_MUSL_CANONICAL_HOST]) - case "$host_os" in - *-musl*) AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ;; - esac -]) - -# Like AC_CANONICAL_HOST, except for a fix regarding Alpine Linux 3.10. - -AC_DEFUN([gl_MUSL_CANONICAL_HOST], -[ AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - linux*-gnu*) - AC_EGREP_CPP([actually_musl], - [#include <stdarg.h> - #ifdef __DEFINED_va_list - actually_musl - #endif - ], - [host=`echo "$host" | sed -e 's/gnu.*/musl/'` - host_os=`echo "$host_os" | sed -e 's/gnu.*/musl/'` - ]) - ;; + *-musl*) AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ;; esac ]) |