diff options
| author | Michal Domonkos <mdomonko@redhat.com> | 2022-08-29 11:43:28 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2022-09-01 16:21:48 +0300 |
| commit | 6c2ab6f7cdc41715849509aaaa9af4c17299c9dc (patch) | |
| tree | 9af2c4d2ba1ee65b3a44d8c9b8388824e95ffe29 | |
| parent | c05b95b865cf2c981898846ee8269f2a8a0cfe66 (diff) | |
| download | rpm-6c2ab6f7cdc41715849509aaaa9af4c17299c9dc.tar.gz | |
Revert "Strip the target triplet GNU suffix more precisely."
It turns out this wasn't a good fit for a maintenance update as it broke
compilation on certain platforms where it previously worked, see #2143
for details.
This reverts commit 42fae2fa5bce5bf1ef5685619fa8d62a746c9dbd.
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 372875fc4..171dc1ce1 100644 --- a/configure.ac +++ b/configure.ac @@ -830,27 +830,24 @@ AC_DEFINE_UNQUOTED([GID_0_GROUP],["$group_with_gid0"],[Get the group name having # get rid of the 4-th tuple, if config.guess returned "linux-gnu" for host_os # host_os_gnu=-gnu -if echo "$host_os" | grep '.*-gnulibc1$' > /dev/null ; then +if echo "$host_os" | grep '.*-gnulibc1' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnulibc1$//'` fi -if echo "$host_os" | grep '.*-gnueabihf$' > /dev/null ; then +if echo "$host_os" | grep '.*-gnueabihf' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnueabihf$//'` host_os_gnu=-gnueabihf fi -if echo "$host_os" | grep '.*-gnueabi$' > /dev/null ; then +if echo "$host_os" | grep '.*-gnueabi' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnueabi$//'` host_os_gnu=-gnueabi fi -if echo "$host_os" | grep '.*-gnuabi64$' > /dev/null ; then +if echo "$host_os" | grep '.*-gnuabi64' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnuabi64$//'` host_os_gnu=-gnuabi64 fi -if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then +if echo "$host_os" | grep '.*-gnu' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnu$//'` fi -if echo "$host_os" | grep '.*-gnu[[^-]]*$' > /dev/null ; then - AC_MSG_ERROR([unrecognized GNU build triplet $host_os]) -fi changequote(<, >) host_os_exact="${host_os}" |