Module Name:    src
Committed By:   wiz
Date:           Thu Dec 24 00:36:44 UTC 2015

Modified Files:
        src/external/bsd/libproc/lib: Makefile

Log Message:
Mark as using c++ using LIBISCXX instead of manual workaround.

The workaround was confused when MKLLVM was set, but HAVE_LLVM was not.

Solution suggested by joerg.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libproc/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/libproc/lib/Makefile
diff -u src/external/bsd/libproc/lib/Makefile:1.1 src/external/bsd/libproc/lib/Makefile:1.2
--- src/external/bsd/libproc/lib/Makefile:1.1	Thu Sep 24 14:12:48 2015
+++ src/external/bsd/libproc/lib/Makefile	Thu Dec 24 00:36:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/09/24 14:12:48 christos Exp $
+# $NetBSD: Makefile,v 1.2 2015/12/24 00:36:43 wiz Exp $
 
 .include <bsd.own.mk>
 
@@ -36,11 +36,7 @@ CPPFLAGS+=	-DNO_CTF
 .if defined(NOCPLUSPLUS)
 CPPFLAGS+=	-DNO_CXA_DEMANGLE
 .else
-. if ${MKLIBCXX} == "yes"
-LIBDPLIBS+=     c++     ${NETBSDSRCDIR}/external/bsd/libc++/lib
-. else
-LIBDPLIBS+=     stdc++  ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
-. endif
+LIBISCXX=	yes
 .endif
 
 LIBDPLIBS+=	elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf

Reply via email to