Remove $CCFLAGS from the the default definitions of $CXXFLAGS for

Visual C/C++ and MIPSpro C++ on SGI so, they match other tools
and avoid flag duplication on C++ command lines.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3887 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 35578a4d67345d428b8a901037c8c8adceba7910..7413c85b568c7059d1e29491ad06b421e8c068e9 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -67,6 +67,12 @@ RELEASE 1.X - XXX
     - Support implicit dependency scanning of files encoded in utf-8
       and utf-16.
 
+  From Roberto de Vecchi:
+
+    - Remove $CCFLAGS from the the default definitions of $CXXFLAGS for
+      Visual C/C++ and MIPSpro C++ on SGI so, they match other tools
+      and avoid flag duplication on C++ command lines.
+
   From Matthew Wesley:
 
     - Copy file attributes so we identify, and can link a shared library

diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index 0898b91c816f299ad1185ce7f31ba53713f5ee46..09752b3cb3d5af71861e0bbb318b7d1d394afd87 100644 (file)
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -764,7 +764,7 @@ def generate(env):
     env['SHCFLAGS']   = SCons.Util.CLVar('$CFLAGS')
     env['SHCCCOM']    = '$SHCC $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCFLAGS $SHCCFLAGS $_CCCOMCOM'
     env['CXX']        = '$CC'
-    env['CXXFLAGS']   = SCons.Util.CLVar('$CCFLAGS $( /TP $)')
+    env['CXXFLAGS']   = SCons.Util.CLVar('$( /TP $)')
     env['CXXCOM']     = '$CXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $CXXFLAGS $CCFLAGS $_CCCOMCOM'
     env['SHCXX']      = '$CXX'
     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')

diff --git a/src/engine/SCons/Tool/sgic++.py b/src/engine/SCons/Tool/sgic++.py
index 930e29a3040cabfc09e2754f0512d424ebd2c4ea..65d31b3f0fd0d8756c6d388645370242352a3c2f 100644 (file)
--- a/src/engine/SCons/Tool/sgic++.py
+++ b/src/engine/SCons/Tool/sgic++.py
@@ -43,7 +43,7 @@ def generate(env):
     cplusplus.generate(env)
 
     env['CXX']         = 'CC'
-    env['CXXFLAGS']    = SCons.Util.CLVar('$CCFLAGS -LANG:std')
+    env['CXXFLAGS']    = SCons.Util.CLVar('-LANG:std')
     env['SHCXX']       = '$CXX'
     env['SHOBJSUFFIX'] = '.o'
     env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1