From owner-svn-src-all@FreeBSD.ORG  Sat Mar 17 22:12:10 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27414106564A;
	Sat, 17 Mar 2012 22:12:10 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 126E78FC15;
	Sat, 17 Mar 2012 22:12:10 +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 q2HMC9Em089273;
	Sat, 17 Mar 2012 22:12:09 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2HMC9cG089270;
	Sat, 17 Mar 2012 22:12:09 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201203172212.q2HMC9cG089270@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 17 Mar 2012 22:12:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233098 - in head: . lib/libc++
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Mar 2012 22:12:10 -0000

Author: peter
Date: Sat Mar 17 22:12:09 2012
New Revision: 233098
URL: http://svn.freebsd.org/changeset/base/233098

Log:
  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:	theravin

Modified:
  head/Makefile.inc1
  head/lib/libc++/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Mar 17 22:04:58 2012	(r233097)
+++ head/Makefile.inc1	Sat Mar 17 22:12:09 2012	(r233098)
@@ -1243,6 +1243,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} \

Modified: head/lib/libc++/Makefile
==============================================================================
--- head/lib/libc++/Makefile	Sat Mar 17 22:04:58 2012	(r233097)
+++ head/lib/libc++/Makefile	Sat Mar 17 22:12:09 2012	(r233098)
@@ -39,7 +39,7 @@ WARNS=          0
 CXXFLAGS+=      -I${HDRDIR} -I${LIBCXXRTDIR} -std=c++0x -nostdlib -DLIBCXXRT
 
 DPADD=          ${LIBCXXRT}
-LDADD=          -L${.OBJDIR}/../libcxxrt/ -lcxxrt
+LDADD=          -lcxxrt
 LDFLAGS+=       --verbose
 INCSGROUPS=     STD EXT