Author: ablack
Date: Wed Nov 29 13:30:13 2006
New Revision: 480718
URL: http://svn.apache.org/viewvc?view=rev&rev=480718
Log:
2006-11-29 Andrew Black <[EMAIL PROTECTED]>
* acc.config (CCVER, aCC_MAJOR, aCC_MINOR): Convert expensive
assignments from recursive to simple expansion.
* como.config (CCVER, CC_MAJOR, CC_MINOR): Ditto.
* eccp.config (CCVER, ECCP_MAJOR, ECCP_MINOR): Ditto.
* icc.config (CCVER): Ditto.
* osf_cxx.config (CCVER): Ditto.
* reliant_cds.config (CCVER): Ditto.
* sunpro.config (CCVER): Ditto.
* vacpp.config (CCVER, CXX_MAJOR, CXX_MINOR): Ditto.
Modified:
incubator/stdcxx/trunk/etc/config/acc.config
incubator/stdcxx/trunk/etc/config/como.config
incubator/stdcxx/trunk/etc/config/eccp.config
incubator/stdcxx/trunk/etc/config/icc.config
incubator/stdcxx/trunk/etc/config/osf_cxx.config
incubator/stdcxx/trunk/etc/config/reliant_cds.config
incubator/stdcxx/trunk/etc/config/sunpro.config
incubator/stdcxx/trunk/etc/config/vacpp.config
Modified: incubator/stdcxx/trunk/etc/config/acc.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/acc.config?view=diff&rev=480718&r1=480717&r2=480718
==============================================================================
--- incubator/stdcxx/trunk/etc/config/acc.config (original)
+++ incubator/stdcxx/trunk/etc/config/acc.config Wed Nov 29 13:30:13 2006
@@ -7,9 +7,9 @@
CXX = aCC
-CCVER = $(shell $(CXX) -V 2>&1 | awk '{ print $$6 }')
-aCC_MAJOR = $(shell echo $(CCVER) | sed "s/[^.]*\.\([0-9]*\)\..*/\1/")
-aCC_MINOR = $(shell echo $(CCVER) | sed "s/[^.]*\.[^.]*\.\([0-9]*\)/\1/")
+CCVER := $(shell $(CXX) -V 2>&1 | awk '{ print $$6 }')
+aCC_MAJOR := $(shell echo $(CCVER) | sed "s/[^.]*\.\([0-9]*\)\..*/\1/")
+aCC_MINOR := $(shell echo $(CCVER) | sed "s/[^.]*\.[^.]*\.\([0-9]*\)/\1/")
WARNFLAGS = +w +W392 +W655 +W684 +W818 +W819 +W849
Modified: incubator/stdcxx/trunk/etc/config/como.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/como.config?view=diff&rev=480718&r1=480717&r2=480718
==============================================================================
--- incubator/stdcxx/trunk/etc/config/como.config (original)
+++ incubator/stdcxx/trunk/etc/config/como.config Wed Nov 29 13:30:13 2006
@@ -6,9 +6,9 @@
##############################################################################
CXX = como
-CCVER = $(shell $(CXX) -v foo.c 2>&1 | head -1 | awk '{ print $$3'})
-CC_MAJOR = $(shell echo "$(CCVER)" | sed -n "s/^\([^\.]*\).*/\1/p")
-CC_MINOR = $(shell echo "$(CCVER)" | sed -n "s/^.*\.\([0-9]*\).*/\1/p")
+CCVER := $(shell $(CXX) -v foo.c 2>&1 | head -1 | awk '{ print $$3'})
+CC_MAJOR := $(shell echo "$(CCVER)" | sed -n "s/^\([^\.]*\).*/\1/p")
+CC_MINOR := $(shell echo "$(CCVER)" | sed -n "s/^.*\.\([0-9]*\).*/\1/p")
ifeq ($(CC_MINOR),2)
CPPFLAGS = -I$(TOPDIR)/include/ansi --incl_suffixes ::
Modified: incubator/stdcxx/trunk/etc/config/eccp.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/eccp.config?view=diff&rev=480718&r1=480717&r2=480718
==============================================================================
--- incubator/stdcxx/trunk/etc/config/eccp.config (original)
+++ incubator/stdcxx/trunk/etc/config/eccp.config Wed Nov 29 13:30:13 2006
@@ -6,9 +6,9 @@
##############################################################################
CXX = eccp
-CCVER = $(shell eccp -v foo.c 2>&1 | head -1 | awk '{ print $$8'})
-ECCP_MAJOR = $(shell echo "$(CCVER)" | sed -n "s/^\([^\.]*\).*/\1/p")
-ECCP_MINOR = $(shell echo "$(CCVER)" | sed -n "s/^.*\.\([0-9]*\).*/\1/p")
+CCVER := $(shell eccp -v foo.c 2>&1 | head -1 | awk '{ print $$8'})
+ECCP_MAJOR := $(shell echo "$(CCVER)" | sed -n "s/^\([^\.]*\).*/\1/p")
+ECCP_MINOR := $(shell echo "$(CCVER)" | sed -n "s/^.*\.\([0-9]*\).*/\1/p")
ifeq ($(ECCP_MAJOR),2)
CPPFLAGS = -I$(TOPDIR)/include/ansi --incl_suffixes ::
Modified: incubator/stdcxx/trunk/etc/config/icc.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/icc.config?view=diff&rev=480718&r1=480717&r2=480718
==============================================================================
--- incubator/stdcxx/trunk/etc/config/icc.config (original)
+++ incubator/stdcxx/trunk/etc/config/icc.config Wed Nov 29 13:30:13 2006
@@ -14,7 +14,7 @@
endif
endif
-CCVER = $(shell $(CXX) -V foo.c 2>&1 | sed -n "s/.*Version
*\([0-9.]*\).*/\1/p")
+CCVER := $(shell $(CXX) -V foo.c 2>&1 | sed -n "s/.*Version
*\([0-9.]*\).*/\1/p")
CPPFLAGS = -I$(TOPDIR)/include/ansi
CXXFLAGS = -Xc -no_cpprt
Modified: incubator/stdcxx/trunk/etc/config/osf_cxx.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/osf_cxx.config?view=diff&rev=480718&r1=480717&r2=480718
==============================================================================
--- incubator/stdcxx/trunk/etc/config/osf_cxx.config (original)
+++ incubator/stdcxx/trunk/etc/config/osf_cxx.config Wed Nov 29 13:30:13 2006
@@ -6,7 +6,7 @@
##############################################################################
CXX = cxx
-CCVER = $(shell $(CXX) -V 2>&1 | awk '{ print $$3 }')
+CCVER := $(shell $(CXX) -V 2>&1 | awk '{ print $$3 }')
CXXFLAGS = -x cxx -nocxxstd -std strict_ansi_errors
WARNFLAGS = -w1 -msg_disable 450
DEPENDFLAGS = -M -noimplicit_include
Modified: incubator/stdcxx/trunk/etc/config/reliant_cds.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/reliant_cds.config?view=diff&rev=480718&r1=480717&r2=480718
==============================================================================
--- incubator/stdcxx/trunk/etc/config/reliant_cds.config (original)
+++ incubator/stdcxx/trunk/etc/config/reliant_cds.config Wed Nov 29 13:30:13
2006
@@ -6,7 +6,7 @@
##############################################################################
CXX = CC
-CCVER = $(shell $(CXX) -V /bogus/file.cpp 2>&1 | head -1 | awk '{
print $4 }')
+CCVER := $(shell $(CXX) -V /bogus/file.cpp 2>&1 | head -1 | awk '{
print $4 }')
CXXFLAGS = -Xe
WARNFLAGS =
DEPENDFLAGS = -M
Modified: incubator/stdcxx/trunk/etc/config/sunpro.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/sunpro.config?view=diff&rev=480718&r1=480717&r2=480718
==============================================================================
--- incubator/stdcxx/trunk/etc/config/sunpro.config (original)
+++ incubator/stdcxx/trunk/etc/config/sunpro.config Wed Nov 29 13:30:13 2006
@@ -9,7 +9,7 @@
# extract the "C++ m.n" substring from version string (whcih changes
# from one release of the compiler to another)
-CCVER = $(shell $(CXX) -V 2>&1 | head -n1 | sed 's/.*C\+\+ *\([^
]*\).*/\1/')
+CCVER := $(shell $(CXX) -V 2>&1 | head -n1 | sed 's/.*C\+\+ *\([^
]*\).*/\1/')
WARNFLAGS = +w
DEPENDFLAGS = -xM
PICFLAGS = -KPIC
Modified: incubator/stdcxx/trunk/etc/config/vacpp.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/vacpp.config?view=diff&rev=480718&r1=480717&r2=480718
==============================================================================
--- incubator/stdcxx/trunk/etc/config/vacpp.config (original)
+++ incubator/stdcxx/trunk/etc/config/vacpp.config Wed Nov 29 13:30:13 2006
@@ -35,11 +35,11 @@
endif
# invoke a script to determine the exact version
-CCVER = $(shell etc/config/xlC_version.sh)
+CCVER := $(shell etc/config/xlC_version.sh)
# determine the major and minor version of the compiler
-CXX_MAJOR = $(shell echo "$(CCVER)" | sed "s/^\([1-9][0-9]*\).*/\1/")
-CXX_MINOR = $(shell echo "$(CCVER)" | sed "s/[1-9]*\.\([0-9]*\).*/\1/")
+CXX_MAJOR := $(shell echo "$(CCVER)" | sed "s/^\([1-9][0-9]*\).*/\1/")
+CXX_MINOR := $(shell echo "$(CCVER)" | sed "s/[1-9]*\.\([0-9]*\).*/\1/")
# determine the major and minor version of the OS on AIX
ifeq ($(OSNAME),AIX)
