/[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 675 by robwdcock, Sun Mar 26 07:28:06 2006 UTC revision 676 by robwdcock, Sun Mar 26 10:13:34 2006 UTC
# Line 86  opts.AddOptions( Line 86  opts.AddOptions(
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  if os.name != "nt" and os.uname()[4]=='ia64':  if os.name != "nt" and os.uname()[4]=='ia64':
89     env = Environment(ENV = {'PATH' : os.environ['PATH']}, tools = ['default', 'intelc'], options = opts)     env = Environment(ENV = {'PATH':os.environ['PATH'], 'LD_LIBRARY_PATH':os.environ['LD_LIBRARY_PATH']}, tools = ['default', 'intelc'], options = opts)
90     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
91        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
92  elif os.name == "nt":  elif os.name == "nt":
93     env = Environment(tools = ['default', 'intelc'], options = opts)     env = Environment(ENV = {'LD_LIBRARY_PATH':os.environ['LD_LIBRARY_PATH']}, tools = ['default', 'intelc'], options = opts)
94  else:  else:
95     env = Environment(tools = ['default'], options = opts)     env = Environment(ENV = {'LD_LIBRARY_PATH':os.environ['LD_LIBRARY_PATH']}, tools = ['default'], options = opts)
96    
97  # Setup help for options  # Setup help for options
98  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
# Line 119  except KeyError: Line 119  except KeyError:
119  try:  try:
120     libinstall = env['libinstall']     libinstall = env['libinstall']
121     env.Append(LIBPATH = [libinstall,])     env.Append(LIBPATH = [libinstall,])
122       env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
123  except KeyError:  except KeyError:
124     libinstall = None       libinstall = None  
125  try:  try:
126     pyinstall = env['pyinstall']     pyinstall = env['pyinstall']+'/esys' # all targets will install into pyinstall/esys but PYTHONPATH points at straight pyinstall so you go import esys.escript etc
127       env.PrependENVPath('PYTHONPATH', env['pyinstall'])
128  except KeyError:  except KeyError:
129     pyinstall = None       pyinstall = None  
130  try:  try:
Legend:
Removed from v.675  
changed lines
  Added in v.676
  ViewVC Help
Powered by ViewVC 1.1.26