From e0f433a5f34a1b2da4f34dbba7d82643f685c612 Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Fri, 9 Mar 2018 20:48:04 +0000 Subject: [PATCH] cvs-revert-gnu-gnu-cleanup commit ebf27d12e602b428a316c105ed10371ed84d2d3d Author: Samuel Thibault Date: Wed Feb 11 23:27:50 2015 +0000 revert part of ba90e05. * configure.ac, configure: Revert ba90e05: modify gnu-* host_os back into gnu-gnu, and update comment to refer to abi-tags. Gbp-Pq: Topic hurd-i386 Gbp-Pq: Name cvs-revert-gnu-gnu-cleanup.diff --- configure | 12 ++++++++++++ configure.ac | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/configure b/configure index 7a8bd3f81..a5243d0a1 100755 --- a/configure +++ b/configure @@ -3741,6 +3741,18 @@ else fi +# The abi-tags file uses a fairly simplistic model for name recognition that +# can't distinguish i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a +# $host_os of `gnu*' here to be `gnu-gnu*' just so that it can tell. +# This doesn't get used much beyond that, so it's fairly safe. +case "$host_os" in +linux*) + ;; +gnu*) + host_os=`echo $host_os | sed -e 's/gnu/gnu-gnu/'` + ;; +esac + # We keep the original values in `$config_*' and never modify them, so we # can write them unchanged into config.make. Everything else uses # $machine, $vendor, and $os, and changes them whenever convenient. diff --git a/configure.ac b/configure.ac index ca1282a6b..6938ff1e3 100644 --- a/configure.ac +++ b/configure.ac @@ -453,6 +453,18 @@ AC_ARG_ENABLE([mathvec], [build_mathvec=$enableval], [build_mathvec=notset]) +# The abi-tags file uses a fairly simplistic model for name recognition that +# can't distinguish i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a +# $host_os of `gnu*' here to be `gnu-gnu*' just so that it can tell. +# This doesn't get used much beyond that, so it's fairly safe. +case "$host_os" in +linux*) + ;; +gnu*) + host_os=`echo $host_os | sed -e 's/gnu/gnu-gnu/'` + ;; +esac + # We keep the original values in `$config_*' and never modify them, so we # can write them unchanged into config.make. Everything else uses # $machine, $vendor, and $os, and changes them whenever convenient. -- 2.30.2