cvs-revert-gnu-gnu-cleanup

commit ebf27d12e602b428a316c105ed10371ed84d2d3d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
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

diff --git a/configure b/configure
index ee637a7caf98e329b404506bad0e09c5e3cd4dc6..1184784c896561ea818160b82a33f47f6b0b03d1 100755 (executable)
--- a/configure
+++ b/configure
@@ -3736,6 +3736,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 d288ff43cdcb2f17b1ef50d9016ee23a1fafd167..172d10823c268c49631c26895332e166591c7719 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -449,6 +449,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.