[Libreoffice-commits] .: 3 commits - .gitignore solenv/gbuild

[Caolán McNamara]

 .gitignore                         |    1 +
 solenv/gbuild/platform/unxgcc.mk   |   11 ++++++++---
 solenv/gbuild/platform/winmingw.mk |    1 -
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 61e8de1fd8e5001a5770236b41636267f672e578
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 26 16:30:38 2011 +0000

    add translate_toolkit to .gitignore

diff --git a/.gitignore b/.gitignore
index 0e1d50e..b25b364 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,6 +231,7 @@
 /tomcat
 /toolkit
 /tools
+/translate_toolkit
 /twain
 /ucb
 /ucbhelper
commit a053405c87afa8e64a5b2ad3c04aca64c38a7c22
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 25 13:44:09 2011 +0000

    we can build with strict-aliasing with >= 4.6.0 now

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 80f701e..36b315e 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -72,7 +72,6 @@ gb_CFLAGS := \
 	-fPIC \
 	-fmessage-length=0 \
 	-fno-common \
-	-fno-strict-aliasing \
 	-fvisibility=hidden \
 	-pipe \
 
@@ -86,11 +85,18 @@ gb_CXXFLAGS := \
 	-fPIC \
 	-fmessage-length=0 \
 	-fno-common \
-	-fno-strict-aliasing \
 	-fvisibility-inlines-hidden \
 	-fvisibility=hidden \
 	-pipe \
 
+gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
+gb_StrictAliasingUnsafe := $(shell expr $(gb_CCVER) \< 40600)
+
+ifeq ($(gb_StrictAliasingUnsafe),1)
+gb_CFLAGS += -fno-strict-aliasing
+gb_CXXFLAGS += -fno-strict-aliasing
+endif
+
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror
 gb_CXXFLAGS_WERROR := -Werror
commit 67d5d657d1353d6d1324b32cbbc1fae6e675f1b3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 25 12:59:58 2011 +0000

    -fno-use-cxa-atexit is dubious IMO

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 3a1a6ee..80f701e 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -87,7 +87,6 @@ gb_CXXFLAGS := \
 	-fmessage-length=0 \
 	-fno-common \
 	-fno-strict-aliasing \
-	-fno-use-cxa-atexit \
 	-fvisibility-inlines-hidden \
 	-fvisibility=hidden \
 	-pipe \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 05f69de..3845eae 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -118,7 +118,6 @@ gb_CXXFLAGS := \
 	-Wuninitialized \
 	-fmessage-length=0 \
 	-fno-strict-aliasing \
-	-fno-use-cxa-atexit \
 	-pipe \
 	-nostdinc \