restore original position of tg_compv.mk

grab the compiler version explicitly in unxlng.mk

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

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