Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Mar 2012 22:12:09 +0000 (UTC)
From:      Peter Wemm <peter@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r233098 - in head: . lib/libc++
Message-ID:  <201203172212.q2HMC9cG089270@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203172212.q2HMC9cG089270>