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

Diff of /branches/amg_from_3530/SConstruct

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

revision 1024 by gross, Tue Mar 13 06:31:50 2007 UTC revision 1026 by phornby, Tue Mar 13 08:25:00 2007 UTC
# Line 149  opts.AddOptions( Line 149  opts.AddOptions(
149  # 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
150    
151  if os.name != "nt" and os.uname()[4]=='ia64':  if os.name != "nt" and os.uname()[4]=='ia64':
152     env = Environment(ENV = {'PATH':path}, tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'intelc'], options = opts)
153     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
154        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
155  elif os.name == "nt":  elif os.name == "nt":
156     env = Environment(tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'msvc'], options = opts)
157  else:  else:
158     env = Environment(tools = ['default'], options = opts)     env = Environment(tools = ['default'], options = opts)
159  # Initialise Scons Build Environment  # Initialise Scons Build Environment

Legend:
Removed from v.1024  
changed lines
  Added in v.1026

  ViewVC Help
Powered by ViewVC 1.1.26