updates for GCC 12 (relatively tiny).
- gcov-iov.h is now called version.h and we build it directly. - need to explicitly ask for bversion.h gtyp-input.list to be built.
This commit is contained in:
parent
4309203d47
commit
e374a119f0
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.106 2023/07/28 08:05:29 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.107 2023/07/31 01:48:37 mrg Exp $
|
||||
|
||||
.include <bsd.hostinit.mk>
|
||||
|
||||
|
@ -110,6 +110,12 @@ MKNATIVE_CONFIG_TARGET_LIBS+= \
|
|||
.endif
|
||||
.endif
|
||||
|
||||
.if ${HAVE_GCC} <= 10
|
||||
EXTRA_FILES= gcov-iov.h
|
||||
.else
|
||||
EXTRA_FILES= bversion.h gtyp-input.list
|
||||
.endif
|
||||
|
||||
BINENV= /usr/bin/env -i
|
||||
|
||||
|
||||
|
@ -230,7 +236,7 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
|
|||
-e 's/\(maybe-all-target-libgcc:\) all-target-libgcc/\1/' \
|
||||
< Makefile.config > Makefile)
|
||||
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
|
||||
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
|
||||
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h ${EXTRA_FILES})
|
||||
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
|
||||
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h); \
|
||||
(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# $NetBSD: mknative-gcc,v 1.116 2022/07/22 06:50:26 mrg Exp $
|
||||
# $NetBSD: mknative-gcc,v 1.117 2023/07/31 01:48:37 mrg Exp $
|
||||
#
|
||||
# Shell script for generating all the constants needed for a native
|
||||
# platform build of gcc.
|
||||
|
@ -132,9 +132,6 @@ get_libgcov () {
|
|||
LIBGCOV_DRIVER
|
||||
} | write_mk $_OUTDIRBASE/lib/lib$_subdir/libgcov/arch/$_MACHINE_ARCH/defs.mk
|
||||
|
||||
write_c $_OUTDIRBASE/lib/lib$_subdir/libgcov/arch/$_MACHINE_ARCH/gcov-iov.h \
|
||||
<$_TMPDIR/gcc/gcov-iov.h
|
||||
|
||||
}
|
||||
|
||||
##### lib/libiberty #####
|
||||
|
|
Loading…
Reference in New Issue