[src/trunk]: src/tools/gcc in configargs.h, as well as normalising to /usr/sr...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86bb6bc4c57c
branches:  trunk
changeset: 993313:86bb6bc4c57c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Sep 04 06:40:37 2018 +0000

description:
in configargs.h, as well as normalising to /usr/src, normalise the
--build to the same as the --host, so that it never changes based
upon the host you ran mknative on.  (some recent changes are only
because i updated a system from netbsd-7 to netbsd-8.  this will
avoid that in the future.)

diffstat:

 tools/gcc/mknative-gcc |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r efec378fb7f2 -r 86bb6bc4c57c tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Tue Sep 04 06:09:31 2018 +0000
+++ b/tools/gcc/mknative-gcc    Tue Sep 04 06:40:37 2018 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.92 2018/02/06 07:04:01 mrg Exp $
+#      $NetBSD: mknative-gcc,v 1.93 2018/09/04 06:40:37 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -369,10 +369,9 @@
                if [ "${f}" = "configargs" ]
                then
                        _srcquoted=$(echo "$_SRC" | sed 's/\//\\\//g')
-                       ex <<__EOF__ $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
-/static const char configuration_arguments/ s/$_srcquoted/\/usr\/src/g
-wq
-__EOF__
+                       sed -i -E -e "s,$_srcquoted,/usr/src,g" \
+                                 -e 's/--build=[^ ]+ --host=([^ ]+)/--build=\1 --host=\1/' \
+                               $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
                fi
        done