/[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 676 by robwdcock, Sun Mar 26 10:13:34 2006 UTC revision 677 by robwdcock, Sun Mar 26 11:25:19 2006 UTC
# Line 85  opts.AddOptions( Line 85  opts.AddOptions(
85  # environment which isn't the "scons way"  # environment which isn't the "scons way"
86  # 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)
87  # 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
88    try:
89       python_path = os.environ['PYTHONPATH']
90    except KeyError:
91       python_path = ''
92    
93  if os.name != "nt" and os.uname()[4]=='ia64':  if os.name != "nt" and os.uname()[4]=='ia64':
94     env = Environment(ENV = {'PATH':os.environ['PATH'], 'LD_LIBRARY_PATH':os.environ['LD_LIBRARY_PATH']}, tools = ['default', 'intelc'], options = opts)     env = Environment(ENV = {'PATH':os.environ['PATH'], 'LD_LIBRARY_PATH':os.environ['LD_LIBRARY_PATH'], 'PYTHONPATH':python_path}, tools = ['default', 'intelc'], options = opts)
95     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
96        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
97  elif os.name == "nt":  elif os.name == "nt":
98     env = Environment(ENV = {'LD_LIBRARY_PATH':os.environ['LD_LIBRARY_PATH']}, tools = ['default', 'intelc'], options = opts)     # FIXME: Need to implement equivalent of ld library path for windoze
99       env = Environment(ENV = {'PYTHONPATH':python_path}, tools = ['default', 'intelc'], options = opts)
100  else:  else:
101     env = Environment(ENV = {'LD_LIBRARY_PATH':os.environ['LD_LIBRARY_PATH']}, tools = ['default'], options = opts)     env = Environment(ENV = {'LD_LIBRARY_PATH':os.environ['LD_LIBRARY_PATH'], 'PYTHONPATH':python_path}, tools = ['default'], options = opts)
102    
103  # Setup help for options  # Setup help for options
104  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))

Legend:
Removed from v.676  
changed lines
  Added in v.677

  ViewVC Help
Powered by ViewVC 1.1.26