diff options
author | peter <peter@FreeBSD.org> | 2012-03-17 22:12:09 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2012-03-17 22:12:09 +0000 |
commit | 7af7d69c50251e2fa1d112707e1ec06e1830e1b3 (patch) | |
tree | b940cb2cdd34d6c5a59d810f8b9675d2426611ea | |
parent | eb494d678de962a38a167f6340ee1f70f7473fa5 (diff) | |
download | FreeBSD-src-7af7d69c50251e2fa1d112707e1ec06e1830e1b3.zip FreeBSD-src-7af7d69c50251e2fa1d112707e1ec06e1830e1b3.tar.gz |
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
-rw-r--r-- | Makefile.inc1 | 3 | ||||
-rw-r--r-- | lib/libc++/Makefile | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 380038c..80a360e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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} \ diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index 88c456a..fc35ea5 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -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 |