[Libreoffice-commits] core.git: 2 commits - connectivity/CppunitTest_connectivity_commontools.mk solenv/inc

[Tor Lillqvist]

 connectivity/CppunitTest_connectivity_commontools.mk |    2 ++
 solenv/inc/unxgcc.mk                                 |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 32e2cfda10c0e98e0157dcff1f0c1085ad266d07
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 5 18:07:59 2013 +0200

    clang: error: argument unused during compilation: '-fpermissive'
    
    Change-Id: I79db3d1b611315aab8a6c3a28d259a589dfa41d7

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index 1678e7b..6026e80 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -21,10 +21,12 @@ $(eval $(call gb_CppunitTest_use_external,connectivity_commontools,boost_headers
 $(eval $(call gb_CppunitTest_use_sdk_api,connectivity_commontools))
 
 ifeq ($(COM),GCC)
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
 $(eval $(call gb_CppunitTest_add_cxxflags,connectivity_commontools,\
 	-fpermissive \
 ))
 endif
+endif
 
 ifeq ($(WINDOWS_SDK_VERSION),80)
 $(eval $(call gb_CppunitTest_add_defs,connectivity_commontools,\
commit ee0bfd04c44f7265e2365652513a6fc0a9b76024
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 5 17:52:53 2013 +0200

    Drop misleading comment
    
    Change-Id: I09ba3b2c7502b56241aa957b05c443270c1cd56e

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index f3f03d6..652bdb8 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -91,7 +91,6 @@ CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
 # Flags for disabling exception handling
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 
-# -fpermissive should be removed as soon as possible
 CFLAGSCXX= -pipe $(ARCH_FLAGS)
 .IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE"
 CFLAGSCXX += -fno-threadsafe-statics