[Midnightbsd-cvs] src [8028] trunk: try to sync up libcxxrt handling

[laffer1 at midnightbsd.org]

Revision: 8028
          http://svnweb.midnightbsd.org/src/?rev=8028
Author:   laffer1
Date:     2016-09-15 16:26:28 -0400 (Thu, 15 Sep 2016)
Log Message:
-----------
try to sync up libcxxrt handling

Modified Paths:
--------------
    trunk/gnu/lib/libstdc++/Makefile
    trunk/gnu/lib/libsupc++/Makefile
    trunk/share/mk/bsd.prog.mk

Modified: trunk/gnu/lib/libstdc++/Makefile
===================================================================
--- trunk/gnu/lib/libstdc++/Makefile	2016-09-15 20:23:21 UTC (rev 8027)
+++ trunk/gnu/lib/libstdc++/Makefile	2016-09-15 20:26:28 UTC (rev 8028)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/gnu/lib/libstdc++/Makefile,v 1.4 2009/05/22 00:27:26 laffer1 Exp $
+# $MidnightBSD$
 # $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.61 2007/08/16 23:02:00 kan Exp $
 
 GCCVER=	4.2
@@ -20,6 +20,7 @@
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
 		-Wno-deprecated
+CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
 PO_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}
 
 DPADD=		${LIBM}

Modified: trunk/gnu/lib/libsupc++/Makefile
===================================================================
--- trunk/gnu/lib/libsupc++/Makefile	2016-09-15 20:23:21 UTC (rev 8027)
+++ trunk/gnu/lib/libsupc++/Makefile	2016-09-15 20:26:28 UTC (rev 8028)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/gnu/lib/libsupc++/Makefile,v 1.4 2009/05/22 00:27:28 laffer1 Exp $
+# $MidnightBSD$
 # $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.9 2007/05/19 04:25:56 kan Exp $
 
 GCCVER=	4.2
@@ -25,6 +25,7 @@
 CFLAGS+=	-I${.CURDIR}/../libstdc++ -I.
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
+CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
 PO_CXXFLAGS=    ${CXXFLAGS:N-ffunction-sections}
 
 HDRS=	exception new typeinfo cxxabi.h exception_defines.h

Modified: trunk/share/mk/bsd.prog.mk
===================================================================
--- trunk/share/mk/bsd.prog.mk	2016-09-15 20:23:21 UTC (rev 8027)
+++ trunk/share/mk/bsd.prog.mk	2016-09-15 20:26:28 UTC (rev 8028)
@@ -1,6 +1,6 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
 # $FreeBSD: src/share/mk/bsd.prog.mk,v 1.144.2.1 2005/11/28 19:08:51 ru Exp $
-# $MidnightBSD: src/share/mk/bsd.prog.mk,v 1.9 2012/06/13 01:46:00 laffer1 Exp $
+# $MidnightBSD$
 
 .include <bsd.init.mk>
 
@@ -147,10 +147,14 @@
 .else
 	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
 .if defined(PROG_CXX)
+.if !empty(CXXFLAGS:M-stdlib=libc++)
+	echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
+.else
 	echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
 .endif
 .endif
 .endif
+.endif
 
 .if !target(install)