diff options
| author | Steven Knight <knight@baldmt.com> | 2009-01-10 14:43:42 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-01-10 14:43:42 (GMT) |
| commit | bf20fb39c300ba6cd4a5beaace739d7c422998fe (patch) | |
| tree | 70cae3bd86fe5a077e390eefab53f9893f12a3e7 | |
| parent | 75e77f7662c6f611e455cbe9a2304302b9f1a3dc (diff) | |
| download | SCons-bf20fb39c300ba6cd4a5beaace739d7c422998fe.zip SCons-bf20fb39c300ba6cd4a5beaace739d7c422998fe.tar.gz SCons-bf20fb39c300ba6cd4a5beaace739d7c422998fe.tar.bz2 | |
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.
| -rw-r--r-- | src/CHANGES.txt | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvc.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/sgic++.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 35578a4..7413c85 100644 --- 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 0898b91..09752b3 100644 --- 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 930e29a..65d31b3 100644 --- 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 |