/[escript]/branches/ROBW_XPLATFORM/SConstruct
ViewVC logotype

Diff of /branches/ROBW_XPLATFORM/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 631 by robwdcock, Wed Mar 22 14:11:03 2006 UTC revision 632 by robwdcock, Thu Mar 23 05:00:51 2006 UTC
# Line 82  opts.AddOptions( Line 82  opts.AddOptions(
82  # environment which isn't the "scons way"  # environment which isn't the "scons way"
83  # This doesn't impact linux and windows which will use the default compiler (g++ or msvc, or the intel compiler if it is installed on both platforms)  # This doesn't impact linux and windows which will use the default compiler (g++ or msvc, or the intel compiler if it is installed on both platforms)
84  # FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix  # FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix
85  if os.uname()[4]=='ia64':  if os.name != "nt" and os.uname()[4]=='ia64':
86     env = Environment(ENV = {'PATH' : os.environ['PATH']}, tools = ['default', 'intelc'], options = opts)     env = Environment(ENV = {'PATH' : os.environ['PATH']}, tools = ['default', 'intelc'], options = opts)
87     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
88        env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not). FIXME: this behaviour could be directly incorporated into scons intelc.py        env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not). FIXME: this behaviour could be directly incorporated into scons intelc.py
# Line 106  env.Append(BUILDERS = {'RunUnitTest' : r Line 106  env.Append(BUILDERS = {'RunUnitTest' : r
106  #runPyUnitTest_builder = Builder(action = scons_extensions.runPyUnitTest, suffix = '.passed', src_suffic='.py', single_source=True)  #runPyUnitTest_builder = Builder(action = scons_extensions.runPyUnitTest, suffix = '.passed', src_suffic='.py', single_source=True)
107  #env.Append(BUILDERS = {'RunPyUnitTest' : runPyUnitTest_builder});  #env.Append(BUILDERS = {'RunPyUnitTest' : runPyUnitTest_builder});
108    
 # Compilation flags REQUIRED for a given platform to achieve a successful build (these are added to the ones specific by the compiler options specified on the command line or options file)  
   
109  # Convert the options which are held in environment variable into python variables for ease of handling and configure compilation options  # Convert the options which are held in environment variable into python variables for ease of handling and configure compilation options
110  try:  try:
111     incinstall = env['incinstall']     incinstall = env['incinstall']
# Line 135  except KeyError: Line 133  except KeyError:
133  if dodebug:  if dodebug:
134     try:     try:
135        flags = env['cc_flags_debug']        flags = env['cc_flags_debug']
136          env.Append(CCFLAGS = flags)
137     except KeyError:     except KeyError:
138        pass        pass
139  else:  else:
140     try:     try:
141        flags = env['cc_flags']        flags = env['cc_flags']
142          env.Append(CCFLAGS = flags)
143     except KeyError:     except KeyError:
144        pass        pass
 env.Append(CCFLAGS = flags)  
145    
146  if dodebug:  if dodebug:
147     try:     try:
148        flags = env['cxx_flags_debug']        flags = env['cxx_flags_debug']
149          env.Append(CXXFLAGS = flags)
150     except KeyError:     except KeyError:
151        pass        pass
152  else:  else:
153     try:     try:
154        flags = env['cxx_flags']        flags = env['cxx_flags']
155          env.Append(CXXFLAGS = flags)
156     except KeyError:     except KeyError:
157        pass        pass
 env.Append(CXXFLAGS = flags)  
158    
159  try:  try:
160     flags = env['ar_flags']     flags = env['ar_flags']

Legend:
Removed from v.631  
changed lines
  Added in v.632

  ViewVC Help
Powered by ViewVC 1.1.26