From ff2cf3685b613f65185af6b527d9ed734d85393b Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 21 Oct 2014 20:00:49 +0000 Subject: [PATCH] Always use libc++ as the default c++ stack when building with an external gcc 4.8+ While here disable building gcc from base when using gcc 4.8+ Reviewed by: imp --- share/mk/src.opts.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 91ed3c0f8f2d..f9132c4a7d1f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -358,4 +358,12 @@ MK_${vv:H}:= ${MK_${vv:T}} MK_LLDB:= no .endif +# gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case. +# while in theory we could build it with that, we don't want to do +# that since it creates too much confusion for too little gain. +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800 +MK_GNUCXX:=no +MK_GCC:=no .endif + +.endif # !target(____)