[src/trunk]: src/tools/gcc disable fetching stuff from libsanitizer for now. ...

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

details:   https://anonhg.NetBSD.org/src/rev/3b1e7b8c4428
branches:  trunk
changeset: 943507:3b1e7b8c4428
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Sep 05 10:58:08 2020 +0000

description:
disable fetching stuff from libsanitizer for now.  it needs libstdc++
to build in mknative using gcc makefiles, and our locale changes break
the "normal" build of this.

make sure MKNATIVE_TARGET is always set.  since mknative-gcc doesn't
care about the version any more (we keep two versions for gcc/gcc.old)
simply set it to "gcc".

diffstat:

 tools/gcc/Makefile     |  16 ++++++++++------
 tools/gcc/mknative-gcc |   5 +++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 041189a8c26d -r 3b1e7b8c4428 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Sat Sep 05 09:50:15 2020 +0000
+++ b/tools/gcc/Makefile        Sat Sep 05 10:58:08 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.98 2020/08/13 10:57:53 mrg Exp $
+#      $NetBSD: Makefile,v 1.99 2020/09/05 10:58:08 mrg Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -95,17 +95,21 @@
 
 MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgcc
 MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgomp
-.if ${HAVE_GCC} == 8
-MKNATIVE_TARGET=       gcc8
-.elif ${HAVE_GCC} == 7
-MKNATIVE_TARGET=       gcc7
-.endif
+MKNATIVE_TARGET=       gcc
 
 MKNATIVE_CONFIG_TARGET_LIBS+= \
        configure-target-libstdc++-v3 \
        configure-target-libbacktrace \
        configure-target-libobjc
 
+.if ${HAVE_GCC} >= 9
+# XXX needs to build libstdc++ fully, which fails
+.if 0
+MKNATIVE_CONFIG_TARGET_LIBS+= \
+       configure-target-libsanitizer
+.endif
+.endif
+
 BINENV=                /usr/bin/env -i
 
 
diff -r 041189a8c26d -r 3b1e7b8c4428 tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Sat Sep 05 09:50:15 2020 +0000
+++ b/tools/gcc/mknative-gcc    Sat Sep 05 10:58:08 2020 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.107 2020/09/05 09:49:32 mrg Exp $
+#      $NetBSD: mknative-gcc,v 1.108 2020/09/05 10:58:08 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -490,7 +490,8 @@
        get_gcc_libiberty gcc
        get_libobjc libobjc
        get_libstdcxx_v3 libstdc++-v3 gcc
-       get_libsanitizer libsanitizer
+       # XXX not yet
+       # get_libsanitizer libsanitizer
        get_libdecnumber libdecnumber
        get_libgomp libgomp
        get_libbacktrace libbacktrace