From bdbf3440cef44fdda6b975e29805df1c88b1c9f6 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Fri, 29 Mar 2019 18:43:46 +0000 Subject: Revert r345706: the third time will be the charm When a review is closed via Phabricator it updates the patch attached to the review. I downloaded the raw patch from Phabricator, applied it, and repeated my mistake from r345704 by accident mixing content from D19732 and D19738. For my own personal sanity, I will try not to mix reviews like this in the future. MFC after: 1 month MFC with: r345706 Approved by: emaste (mentor, implicit) --- lib/libc++/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/libc++') diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index d83c4f81c016..50a747c8cfce 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -76,7 +76,9 @@ CFLAGS+= -nostdinc++ CFLAGS+= -nostdlib CFLAGS+= -D_LIBCPP_BUILDING_LIBRARY CFLAGS+= -DLIBCXXRT -CXXSTD= c++11 +.if empty(CXXFLAGS:M-std=*) +CXXFLAGS+= -std=c++11 +.endif LIBADD+= cxxrt INCSGROUPS= STD EXP EXT -- cgit v1.3