[Opal-commits] opal SConstruct,1.7,1.8

[tylerstreeter <tyl...@us...>]

Update of /cvsroot/opal/opal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11518

Modified Files:
	SConstruct 
Log Message:
changed SConstruct to uses g++ on IRIX


Index: SConstruct
===================================================================
RCS file: /cvsroot/opal/opal/SConstruct,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SConstruct	4 Mar 2005 23:26:53 -0000	1.7
--- SConstruct	13 Apr 2005 17:31:39 -0000	1.8
***************
*** 14,24 ****
  
  def setupBaseEnvironment():
! 	env = Environment(ENV = os.environ, 
! 		options = opts, 
! 		LINKFLAGS = [])
  	return env
  
  def setupGenericUNIXEnvironment(env):
! 	env.Replace(CXX = 'g++')
  	if env['debug'] == True:
  		env.Append(CXXFLAGS = ['-O0'])
--- 14,28 ----
  
  def setupBaseEnvironment():
! 	env = Environment(
! 		ENV = os.environ, 
! 		options = opts)
  	return env
  
  def setupGenericUNIXEnvironment(env):
! 	env = Environment(
! 		ENV = os.environ, 
! 		options = opts,
! 		tools = ['gcc', 'gnulink', 'g++'])
! 
  	if env['debug'] == True:
  		env.Append(CXXFLAGS = ['-O0'])
***************
*** 28,34 ****
  
  def setupIrixEnvironment(env):
! 	env.Replace(CXX = 'CC')
  	env.Append(
! 		CXXFLAGS = ['-ansi', '-LANG:std', '-n32'])
  		#CPPPATH = string.split(os.environ['CPLUS_INCLUDE_PATH'], ':'), 
  		#LIBPATH = string.split(os.environ['LIBRARY_PATH'], ':'))
--- 32,43 ----
  
  def setupIrixEnvironment(env):
! 	env = Environment(
! 		ENV = os.environ, 
! 		options = opts,
! 		tools = ['gcc', 'gnulink', 'g++'])
! 
  	env.Append(
! 		#CXXFLAGS = ['-ansi', '-LANG:std', '-n32'])
! 		CXXFLAGS = ['-ansi', '-LANG:std', '-mabi=n32'])
  		#CPPPATH = string.split(os.environ['CPLUS_INCLUDE_PATH'], ':'), 
  		#LIBPATH = string.split(os.environ['LIBRARY_PATH'], ':'))
***************
*** 40,43 ****
--- 49,56 ----
  
  def setupWin32Environment(env):
+ 	env = Environment(
+ 		ENV = os.environ, 
+ 		options = opts)
+ 
  	env.Append(
                 CPPDEFINES = ['/DWIN32', '/D_WIN32', '/W3', '/DOPAL_DLL_EXPORTING'], 
***************
*** 72,78 ****
  env = setupBaseEnvironment()
  
- env.Append(CPPPATH = env['extra_include_path'], 
- 	LIBPATH = env['extra_lib_path'])
- 
  # Add platform-specific stuff
  if env['PLATFORM'] == 'win32':
--- 85,88 ----
***************
*** 83,86 ****
--- 93,99 ----
  	env = setupGenericUNIXEnvironment(env)
  
+ env.Append(CPPPATH = env['extra_include_path'], 
+ 	LIBPATH = env['extra_lib_path'])
+ 
  # Setup the buildDir where intermediate and library files will be placed
  buildDir = ''