/[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 633 by robwdcock, Thu Mar 23 05:00:51 2006 UTC revision 634 by robwdcock, Thu Mar 23 06:03:46 2006 UTC
# Line 14  import scons_extensions Line 14  import scons_extensions
14  # These are defaults and can be overridden using command line arguments or an options file.  # These are defaults and can be overridden using command line arguments or an options file.
15  # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used  # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used
16  # DO NOT CHANGE THEM HERE  # DO NOT CHANGE THEM HERE
 options_file = None  
17  if ARGUMENTS.get('options_file',0):  if ARGUMENTS.get('options_file',0):
18     options_file = ARGUMENTS.get('options_file',0)     options_file = ARGUMENTS.get('options_file',0)
19  else:  else:
# Line 87  if os.name != "nt" and os.uname()[4]=='i Line 86  if os.name != "nt" and os.uname()[4]=='i
86     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
87        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
88  else:  else:
89     env = Environment(tools = ['default', 'intelc'])     env = Environment(tools = ['default', 'intelc'], options = opts)
90    
91  # Setup help for options  # Setup help for options
92  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))

Legend:
Removed from v.633  
changed lines
  Added in v.634

  ViewVC Help
Powered by ViewVC 1.1.26