aboutsummaryrefslogtreecommitdiff
path: root/lib/libgcc_eh
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2019-03-29 18:43:46 +0000
committerEnji Cooper <ngie@FreeBSD.org>2019-03-29 18:43:46 +0000
commitbdbf3440cef44fdda6b975e29805df1c88b1c9f6 (patch)
tree56c529711cd8f3d7791fa3caf99f1256719fabbf /lib/libgcc_eh
parent760b1a815b5c2fbb0f32796d3bc731aac8c87ace (diff)
downloadsrc-bdbf3440cef44fdda6b975e29805df1c88b1c9f6.tar.gz
src-bdbf3440cef44fdda6b975e29805df1c88b1c9f6.zip
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)
Notes
Notes: svn path=/head/; revision=345707
Diffstat (limited to 'lib/libgcc_eh')
-rw-r--r--lib/libgcc_eh/Makefile.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc
index 39cccec7e6d9..5c8af2141382 100644
--- a/lib/libgcc_eh/Makefile.inc
+++ b/lib/libgcc_eh/Makefile.inc
@@ -27,8 +27,10 @@ CXXFLAGS.${file}+= -fno-exceptions -funwind-tables
.endfor
CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+= -std=c++11
+.endif
CXXFLAGS+= -fno-rtti
-CXXSTD= c++11
STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
# Probably need to just move this earlier or use CXXFLAGS
.if ${MK_DIRDEPS_BUILD} == "yes"