From: stevenknight Date: Mon, 3 Nov 2003 18:04:00 +0000 (+0000) Subject: Restore the default '-LANG:std' C++ flag on SGI IRIX systems before we actually release. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9aa672d27557fe8e381f777e05dccb891e5dc2e;p=scons.git Restore the default '-LANG:std' C++ flag on SGI IRIX systems before we actually release. git-svn-id: http://scons.tigris.org/svn/scons/trunk@834 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 798bacfe..3edfdf90 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 f13736a7..76fa1dc8 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 a818d391..a8c91865 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