summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc13
-rw-r--r--lib/libc++/Makefile2
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
OpenPOWER on IntegriCloud