From owner-svn-src-stable-9@FreeBSD.ORG  Wed Jun 13 19:53:30 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 00E25106566C;
	Wed, 13 Jun 2012 19:53:30 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id E0A338FC14;
	Wed, 13 Jun 2012 19:53:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5DJrTbX045164;
	Wed, 13 Jun 2012 19:53:29 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5DJrTSt045162;
	Wed, 13 Jun 2012 19:53:29 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201206131953.q5DJrTSt045162@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 13 Jun 2012 19:53:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237019 - stable/9
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2012 19:53:30 -0000

Author: dim
Date: Wed Jun 13 19:53:29 2012
New Revision: 237019
URL: http://svn.freebsd.org/changeset/base/237019

Log:
  MFC r233098:
  
  Make sure libgcc_s is finished building in _startup_libs before
  building libcxxrt with high -j levels.  The workaround in
  libc++/Makefile isn't necessary once that race is solved.
  
  Reviewed by:	theraven

Modified:
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Wed Jun 13 19:08:00 2012	(r237018)
+++ stable/9/Makefile.inc1	Wed Jun 13 19:53:29 2012	(r237019)
@@ -1244,6 +1244,9 @@ _startup_libs+=	lib/libcxxrt
 .endif
 
 gnu/lib/libgcc__L: lib/libc__L
+.if ${MK_LIBCPLUSPLUS} != "no"
+lib/libcxxrt__L: gnu/lib/libgcc__L
+.endif
 
 _prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \
 		${_kerberos5_lib_libheimntlm} \