Always stop libstdc++ from using PCH, not just on bootstrap.

the configure test hangs on netbsd, and people who have looked at the PCH
implementation blame it rather than the OS.

whitespace.
This commit is contained in:
maya 2017-07-10 00:21:31 +00:00
parent dceb003d4f
commit d482b82b5e
2 changed files with 4 additions and 4 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.27 2017/01/19 18:52:13 agc Exp $ # $NetBSD: Makefile,v 1.28 2017/07/10 00:21:31 maya Exp $
# #
PKGNAME= gcc-aux-${SNAPSHOT} PKGNAME= gcc-aux-${SNAPSHOT}
@ -187,7 +187,7 @@ MY_MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
# The standard configuration options # The standard configuration options
CONFIGURE_ARGS= --enable-languages=${LANGS:Q} CONFIGURE_ARGS= --enable-languages=${LANGS:Q}
CONFIGURE_ARGS+= --build=${BLD_TARGET} CONFIGURE_ARGS+= --build=${BLD_TARGET}
CONFIGURE_ARGS+= --prefix=${PKG_PREFIX:Q} CONFIGURE_ARGS+= --prefix=${PKG_PREFIX:Q}
CONFIGURE_ARGS+= --enable-threads=posix CONFIGURE_ARGS+= --enable-threads=posix
@ -195,6 +195,7 @@ CONFIGURE_ARGS+= --enable-checking=release
CONFIGURE_ARGS+= --disable-libmudflap CONFIGURE_ARGS+= --disable-libmudflap
CONFIGURE_ARGS+= --disable-libgomp CONFIGURE_ARGS+= --disable-libgomp
CONFIGURE_ARGS+= --disable-libssp CONFIGURE_ARGS+= --disable-libssp
CONFIGURE_ARGS+= --disable-libstdcxx-pch
CONFIGURE_ARGS+= --disable-libcilkrts CONFIGURE_ARGS+= --disable-libcilkrts
CONFIGURE_ARGS+= --disable-libitm CONFIGURE_ARGS+= --disable-libitm
CONFIGURE_ARGS+= ${EXTRA_CONFARGS} CONFIGURE_ARGS+= ${EXTRA_CONFARGS}

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.5 2015/06/14 19:46:51 marino Exp $ # $NetBSD: options.mk,v 1.6 2017/07/10 00:21:31 maya Exp $
# NLS is failing, might be linking with wrong iconv lib. # NLS is failing, might be linking with wrong iconv lib.
# Disable option until further notice # Disable option until further notice
@ -114,7 +114,6 @@ EXTRA_CONFARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex}
.if !empty(PKG_OPTIONS:Mbootstrap) .if !empty(PKG_OPTIONS:Mbootstrap)
EXTRA_CONFARGS+= --disable-shared --disable-lto EXTRA_CONFARGS+= --disable-shared --disable-lto
EXTRA_CONFARGS+= --disable-libstdcxx-pch
. if ${OPSYS} != SunOS . if ${OPSYS} != SunOS
EXTRA_CONFARGS+= --with-stage1-ldflags=-static EXTRA_CONFARGS+= --with-stage1-ldflags=-static
EXTRA_CONFARGS+= --with-boot-ldflags=-static EXTRA_CONFARGS+= --with-boot-ldflags=-static