svn commit: r233098 - in head: . lib/libc++
Peter Wemm
peter at FreeBSD.org
Sat Mar 17 22:12:10 UTC 2012
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
More information about the svn-src-all
mailing list