/[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 640 by robwdcock, Thu Mar 23 13:06:40 2006 UTC revision 641 by robwdcock, Thu Mar 23 14:02:26 2006 UTC
# Line 89  if os.name != "nt" and os.uname()[4]=='i Line 89  if os.name != "nt" and os.uname()[4]=='i
89     env = Environment(ENV = {'PATH' : os.environ['PATH']}, tools = ['default', 'intelc'], options = opts)     env = Environment(ENV = {'PATH' : os.environ['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  else:  elif os.name == "nt":
93     env = Environment(tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'intelc'], options = opts)
94    else:
95       env = Environment(tools = ['default'], options = opts)
96    
97  # Setup help for options  # Setup help for options
98  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
# Line 167  except KeyError: Line 169  except KeyError:
169  try:  try:
170     sys_libs = env['sys_libs']     sys_libs = env['sys_libs']
171  except KeyError:  except KeyError:
172     sys_libs = None       sys_libs = ''
173    
174  try:  try:
175     includes = env['mkl_path']     includes = env['mkl_path']
# Line 182  except KeyError: Line 184  except KeyError:
184  try:  try:
185     mkl_libs = env['mkl_libs']     mkl_libs = env['mkl_libs']
186  except KeyError:  except KeyError:
187     mkl_libs = None       mkl_libs = ''
188  try:  try:
189     includes = env['scsl_path']     includes = env['scsl_path']
190     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 196  except KeyError: Line 198  except KeyError:
198  try:  try:
199     scsl_libs = env['scsl_libs']     scsl_libs = env['scsl_libs']
200  except KeyError:  except KeyError:
201     scsl_libs = None       scsl_libs = ''
202  try:  try:
203     includes = env['umf_path']     includes = env['umf_path']
204     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 210  except KeyError: Line 212  except KeyError:
212  try:  try:
213     umf_libs = env['umf_libs']     umf_libs = env['umf_libs']
214  except KeyError:  except KeyError:
215     umf_libs = None       umf_libs = ''
216  try:  try:
217     includes = env['boost_path']     includes = env['boost_path']
218     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])

Legend:
Removed from v.640  
changed lines
  Added in v.641

  ViewVC Help
Powered by ViewVC 1.1.26