[Libreoffice-commits] .: Branch 'libreoffice-3-3' - solenv/inc

[Caolán McNamara]

 solenv/inc/settings.mk |   11 +++++------
 solenv/inc/unxlng.mk   |    6 +++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 8126991c5d177ce5a99a0d1ebc8d859a7e0282cd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 9 10:04:38 2010 +0000

    restore original position of tg_compv.mk
    
    grab the compiler version explicitly in unxlng.mk
    (cherry picked from commit b3611ba2d74d6b36c9f7758801b4f774b0b013bb)

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index fa7b32e..5bdffba 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1008,12 +1008,6 @@ LNT=$(DEVROOT)/lint/lint
 LNTFLAGS=+v -i$(DEVROOT)/lint/ -mL options.lnt -u
 LNTFLAGSOUTOBJ=-os
 
-.IF "$(DISABLE_ENHANCED_COMID)"==""
-.INCLUDE : tg_compv.mk
-.ELSE          # "$(DISABLE_ENHANCED_COMID)"==""
-COMID=$(COM)
-.ENDIF          # "$(DISABLE_ENHANCED_COMID)"==""
-
 .IF "$(GUI)"=="WNT"
 .INCLUDE : wnt.mk
 .ENDIF
@@ -1093,6 +1087,11 @@ SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
 LZIP*=lzip
 CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
 
+.IF "$(DISABLE_ENHANCED_COMID)"==""
+.INCLUDE : tg_compv.mk
+.ELSE          # "$(DISABLE_ENHANCED_COMID)"==""
+COMID=$(COM)
+.ENDIF          # "$(DISABLE_ENHANCED_COMID)"==""
 .IF "$(SOLAR_JAVA)"=="TRUE"
 .IF "$(USE_JAVAVER)"!=""
 .INCLUDE : tg_javav.mk
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 8a2f075..1b7ee75 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -112,7 +112,11 @@ CFLAGSDBGUTIL=
 # Compiler flags for enabling optimizations
 .IF "$(PRODUCT)"!=""
 CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-.IF "$(USE_SYSTEM_STL)"!="YES" || "$(CCNUMVER)" <= "000400050000"
+
+GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
+
+.IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000"
 #STLPort headers are full of aliasing warnings and
 #At least SLED 10.2 gcc 4.3 overly agressively optimizes
 #uno::Sequence into junk, so only strict-alias on compiler