[Cppunit-cvs] cppunit2 sconstruct,1.17,1.18

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4558

Modified Files:
	sconstruct 
Log Message:
* fixed compilation on AIX

Index: sconstruct
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/sconstruct,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sconstruct	7 Nov 2005 22:43:06 -0000	1.17
--- sconstruct	8 Nov 2005 19:11:38 -0000	1.18
***************
*** 40,52 ****
  
  if platform == 'suncc':
!     env.Tools( 'suncc' )
      env.Append( LIBS = ['pthreads'] )
  elif platform == 'vacpp':
!     env.Tool( 'default', 'aixcc' )
!     env.Append( CCFLAGS = '-qrtti=all',
!                 CXX ='xlC_r',   #scons does not pick-up the correct one !
!                 LINKFLAGS='-bh:5' )  # -bh:5 remove duplicate symbol warning
      # using xlC_r ensure multi-threading is enabled:
      # http://publib.boulder.ibm.com/infocenter/pseries/index.jsp?topic=/com.ibm.vacpp7a.doc/compiler/ref/cuselect.htm
  elif platform == 'msvc6':
      env['MSVS_VERSION']='6.0'
--- 40,55 ----
  
  if platform == 'suncc':
!     env.Tool( 'sunc++' )
!     env.Tool( 'sunlink' )
!     env.Tool( 'sunar' )
      env.Append( LIBS = ['pthreads'] )
  elif platform == 'vacpp':
!     env.Tool( 'default' )
!     env.Tool( 'aixcc' )
!     env['CXX'] = 'xlC_r'   #scons does not pick-up the correct one !
      # using xlC_r ensure multi-threading is enabled:
      # http://publib.boulder.ibm.com/infocenter/pseries/index.jsp?topic=/com.ibm.vacpp7a.doc/compiler/ref/cuselect.htm
+     env.Append( CCFLAGS = '-qrtti=all',
+                 LINKFLAGS='-bh:5' )  # -bh:5 remove duplicate symbol warning
  elif platform == 'msvc6':
      env['MSVS_VERSION']='6.0'