[Libreoffice-commits] core.git: solenv/gbuild

[Douglas Mencken]

 solenv/gbuild/platform/macosx.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3a6d0f22a8d2d8eb1e17e1df21976a2e21947f7a
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Tue Jul 22 09:18:44 2014 -0400

    OSX: change CXXFLAGS_CXX11 to be used not only with clang
    
    Otherwise, zillions of warnings are displayed like:
      "defaulted and deleted functions only available with -std=c++11 or -std=gnu++11"
      "override controls (override/final) only available with -std=c++11 or -std=gnu++11"
    
    Change-Id: Icedaf55c4f301d44587141ad937abbfce8d10457
    Reviewed-on: https://gerrit.libreoffice.org/10130
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a40e054..2fbc8d6 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -56,7 +56,8 @@ gb_CXXFLAGS := \
 	-Wno-non-virtual-dtor \
 	-fno-strict-aliasing \
 	-fsigned-char \
-	$(if $(filter TRUE,$(COM_GCC_IS_CLANG)),$(CXXFLAGS_CXX11),-malign-natural) \
+	$(if $(filter TRUE,$(HAVE_CXX11)),$(CXXFLAGS_CXX11)) \
+	$(if $(filter-out TRUE,$(COM_GCC_IS_CLANG)),-malign-natural)
 
 	#-Wshadow \ break in compiler headers already
 	#-fsigned-char \ might be removed?