Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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".
This commit is contained in:
mrg 2020-09-05 10:58:08 +00:00
parent 8ecbf5f02b
commit ecb0fdec1f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/gcc/Makefile
View File

@ -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> .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-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
.if ${HAVE_GCC} == 8 MKNATIVE_TARGET= gcc
MKNATIVE_TARGET= gcc8
.elif ${HAVE_GCC} == 7
MKNATIVE_TARGET= gcc7
.endif
MKNATIVE_CONFIG_TARGET_LIBS+= \ MKNATIVE_CONFIG_TARGET_LIBS+= \
configure-target-libstdc++-v3 \ configure-target-libstdc++-v3 \
configure-target-libbacktrace \ configure-target-libbacktrace \
configure-target-libobjc 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 BINENV= /usr/bin/env -i

5
tools/gcc/mknative-gcc
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/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 # Shell script for generating all the constants needed for a native
# platform build of gcc. # platform build of gcc.
@ -490,7 +490,8 @@ gcc*)
get_gcc_libiberty gcc get_gcc_libiberty gcc
get_libobjc libobjc get_libobjc libobjc
get_libstdcxx_v3 libstdc++-v3 gcc get_libstdcxx_v3 libstdc++-v3 gcc
get_libsanitizer libsanitizer # XXX not yet
# get_libsanitizer libsanitizer
get_libdecnumber libdecnumber get_libdecnumber libdecnumber
get_libgomp libgomp get_libgomp libgomp
get_libbacktrace libbacktrace get_libbacktrace libbacktrace