From owner-svn-src-all@FreeBSD.ORG  Mon Oct 22 19:44:18 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 30A1FFA6;
 Mon, 22 Oct 2012 19:44:18 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 194F28FC12;
 Mon, 22 Oct 2012 19:44:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9MJiHof088890;
 Mon, 22 Oct 2012 19:44:17 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9MJiHTQ088887;
 Mon, 22 Oct 2012 19:44:17 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201210221944.q9MJiHTQ088887@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 22 Oct 2012 19:44:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241909 - head/lib/libc++
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 19:44:18 -0000

Author: dim
Date: Mon Oct 22 19:44:17 2012
New Revision: 241909
URL: http://svn.freebsd.org/changeset/base/241909

Log:
  Allow building libc++ with any custom -std=xxx flag.  Note that using
  -std=gnu++98 will give a lot of warnings with clang, so please use
  -std=c++0x or higher, or use NO_WERROR.
  
  MFC after:	1 week

Modified:
  head/lib/libc++/Makefile

Modified: head/lib/libc++/Makefile
==============================================================================
--- head/lib/libc++/Makefile	Mon Oct 22 19:22:31 2012	(r241908)
+++ head/lib/libc++/Makefile	Mon Oct 22 19:44:17 2012	(r241909)
@@ -53,7 +53,9 @@ cxxrt_${_S}:
 
 WARNS=		0
 CFLAGS+=	-I${HDRDIR} -I${LIBCXXRTDIR} -nostdlib -DLIBCXXRT
+.if !defined(CXXFLAGS) || ${CXXFLAGS:M-std=*}" == ""
 CXXFLAGS+=	-std=c++0x
+.endif
 
 DPADD=		${LIBCXXRT}
 LDADD=		-lcxxrt