/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 683 by robwdcock, Mon Mar 27 02:43:09 2006 UTC revision 684 by robwdcock, Mon Mar 27 07:34:07 2006 UTC
# Line 111  except KeyError: Line 111  except KeyError:
111  # 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
112    
113  if os.name != "nt" and os.uname()[4]=='ia64':  if os.name != "nt" and os.uname()[4]=='ia64':
114     env = Environment(ENV = {'PATH':path, 'LD_LIBRARY_PATH':ld_library_path, 'PYTHONPATH':python_path}, tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'intelc'], options = opts)
115       env['ENV']['PATH'] = path
116       env['ENV']['LD_LIBRARY_PATH'] = ld_library_path
117       env['ENV']['PYTHONPATH'] = python_path
118     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
119        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
120  elif os.name == "nt":  elif os.name == "nt":
121     # FIXME: Need to implement equivalent of ld library path for windoze     # FIXME: Need to implement equivalent of ld library path for windoze
122     env = Environment(ENV = {'PYTHONPATH':python_path}, tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'intelc'], options = opts)
123       env['ENV']['PYTHONPATH'] = python_path
124  else:  else:
125     env = Environment(ENV = {'PATH':path, 'LD_LIBRARY_PATH':ld_library_path, 'PYTHONPATH':python_path}, tools = ['default'], options = opts)     env = Environment(tools = ['default'], options = opts)
126       env['ENV']['PATH'] = path
127       env['ENV']['LD_LIBRARY_PATH'] = ld_library_path
128       env['ENV']['PYTHONPATH'] = python_path
129    
130  # Setup help for options  # Setup help for options
131  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
Legend:
Removed from v.683  
changed lines
  Added in v.684
  ViewVC Help
Powered by ViewVC 1.1.26