two fixes skrll@ pointed out:

- pass --enable-libstdcxx-threads to enable a bunch of tests and thus
  get the right answers
- MKNATIVE_CONFIG_TARGET_LIBS needs to do libgcc before libstdc++-v3,
  for the GCC 4.8 case.

with these we now get the right threading options in the headers.
This commit is contained in:
mrg 2014-05-28 07:32:22 +00:00
parent 295c54e235
commit f6968e3347

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.67 2014/05/27 09:19:30 skrll Exp $
# $NetBSD: Makefile,v 1.68 2014/05/28 07:32:22 mrg Exp $
.include <bsd.own.mk>
@ -41,7 +41,8 @@ COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
--with-pkgversion="NetBSD nb1 20140527" \
--with-system-zlib \
--enable-__cxa_atexit
--enable-__cxa_atexit \
--enable-libstdcxx-threads
.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
.endif
@ -85,23 +86,23 @@ BUILD_MAKE=${TOOL_GMAKE}
# mknative-gcc specific stuff
#
MKNATIVE_CONFIG_TARGET_LIBS= \
configure-target-libstdc++-v3 \
configure-target-libobjc
MKNATIVE_CONFIG_TARGET_LIBS=
.if ${HAVE_GCC} == 48
MKNATIVE_CONFIG_TARGET_LIBS += configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc48
MKNATIVE_CONFIG_TARGET_LIBS+= \
configure-target-libgomp
.elif ${HAVE_GCC} == 45
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc45
MKNATIVE_CONFIG_TARGET_LIBS+= \
configure-target-libgomp
.else
MKNATIVE_TARGET= gcc4
.endif
MKNATIVE_CONFIG_TARGET_LIBS+= \
configure-target-libstdc++-v3 \
configure-target-libobjc
BINENV= /usr/bin/env -i