Module Name: src
Committed By: mrg
Date: Sat Sep 5 10:58:08 UTC 2020
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
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".
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/tools/gcc/Makefile
cvs rdiff -u -r1.107 -r1.108 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.98 src/tools/gcc/Makefile:1.99
--- src/tools/gcc/Makefile:1.98 Thu Aug 13 10:57:53 2020
+++ src/tools/gcc/Makefile Sat Sep 5 10:58:08 2020
@@ -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=
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
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.107 src/tools/gcc/mknative-gcc:1.108
--- src/tools/gcc/mknative-gcc:1.107 Sat Sep 5 09:49:32 2020
+++ src/tools/gcc/mknative-gcc Sat Sep 5 10:58:08 2020
@@ -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 @@ gcc*)
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
