summaryrefslogtreecommitdiff
path: root/solenv/inc/unxlng.mk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-11-09 10:04:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-11-09 10:05:26 +0000
commitc8094953716e269eeefd5f9a0c3dfdf4c17c6b62 (patch)
tree2137867c6638719234e252e380c73adafb6aac6d /solenv/inc/unxlng.mk
parentf9ab38b12a193830fc6437fd7565a4501dc09bee (diff)
restore original position of tg_compv.mk
grab the compiler version explicitly in unxlng.mk
Diffstat (limited to 'solenv/inc/unxlng.mk')
-rw-r--r--solenv/inc/unxlng.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 8a2f075db84c..1b7ee75d295c 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