diff options
| author | Steven Knight <knight@baldmt.com> | 2003-11-03 18:04:00 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-11-03 18:04:00 (GMT) |
| commit | 2ad63df01d17e348203a11f8e4b1baea23112a34 (patch) | |
| tree | d0f3e5d227ceb3a8d2d6645074f9f11cef207e09 | |
| parent | 14eb6b4ad61ad57ac3a619a49277ecb3e639f101 (diff) | |
| download | SCons-2ad63df01d17e348203a11f8e4b1baea23112a34.zip SCons-2ad63df01d17e348203a11f8e4b1baea23112a34.tar.gz SCons-2ad63df01d17e348203a11f8e4b1baea23112a34.tar.bz2 | |
Restore the default '-LANG:std' C++ flag on SGI IRIX systems before we actually release.
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/RELEASE.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/sgic++.py | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 798bacf..3edfdf9 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -21,8 +21,7 @@ RELEASE X.XX - XXX, XX XXX XXXX XX:XX:XX -XXXX From Steve Leblanc: - - SGI fixes: Fix C++ compilation, add a separate Tool/sgic++.py module, - remove '-LANG:std' from the default SGI $CXXFLAGS and $LINKFLAGS. + - SGI fixes: Fix C++ compilation, add a separate Tool/sgic++.py module. From Gary Oberbrunner: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index f13736a..76fa1dc 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -27,10 +27,6 @@ RELEASE X.XX - XXX, XX XXX XXXX XX:XX:XX -XXXX Please note the following important changes since release 0.93: - - The '-LANG:std' option has been removed from the default $CXXFLAGS - and $LINKFLAGS variables on SGI systems. SGI users who need that flag - for C++ compilation will need to explicitly add it to those variables. - Please note the following important changes since release 0.92: - Construction variables are now expanded anywhere within a diff --git a/src/engine/SCons/Tool/sgic++.py b/src/engine/SCons/Tool/sgic++.py index a818d39..a8c9186 100644 --- a/src/engine/SCons/Tool/sgic++.py +++ b/src/engine/SCons/Tool/sgic++.py @@ -19,8 +19,9 @@ def generate(env): cplusplus.generate(env) - env['CXX'] = 'CC' - env['SHCXX'] = 'CC' + env['CXX'] = 'CC' + env['CXXFLAGS'] = ['$CCFLAGS', '-LANG:std'] + env['SHCXX'] = 'CC' env['SHOBJSUFFIX'] = '.o' env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 |