/[escript]/branches/4.0fordebian/SConstruct
ViewVC logotype

Diff of /branches/4.0fordebian/SConstruct

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

revision 3039 by caltinay, Tue Jun 15 07:21:56 2010 UTC revision 3076 by jfenwick, Mon Aug 2 05:21:40 2010 UTC
# Line 171  adder( Line 171  adder(
171    ('lapack_libs', 'Lapack libraries to link with', []),    ('lapack_libs', 'Lapack libraries to link with', []),
172    ('lapack_type', '{clapack,mkl}','clapack'),    ('lapack_type', '{clapack,mkl}','clapack'),
173  # An option for specifying the compiler tools set (see windows branch).  # An option for specifying the compiler tools set (see windows branch).
174    ('tools_names', 'allow control over the tools in the env setup', ['intelc']),    ('tools_names', 'allow control over the tools in the env setup', ['default']),
175  # finer control over library building, intel aggressive global optimisation  # finer control over library building, intel aggressive global optimisation
176  # works with dynamic libraries on windows.  # works with dynamic libraries on windows.
177    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),
# Line 181  adder( Line 181  adder(
181    BoolVariable('iknowwhatimdoing','allow nonstandard C',False)    BoolVariable('iknowwhatimdoing','allow nonstandard C',False)
182  )  )
183    
   
   
184  ############ Specify which compilers to use ####################  ############ Specify which compilers to use ####################
185    
186  # intelc uses regular expressions improperly and emits a warning about  # intelc uses regular expressions improperly and emits a warning about
# Line 193  if IS_WINDOWS_PLATFORM: Line 191  if IS_WINDOWS_PLATFORM:
191        env = Environment(tools = ['default'] + env['tools_names'],        env = Environment(tools = ['default'] + env['tools_names'],
192                          options = opts)                          options = opts)
193  else:  else:
194     if effective_hostname == 'savanna':      if os.uname()[4]=='ia64':
       env = Environment(tools = ['default', 'intelc'], options = opts)  
    elif os.uname()[4]=='ia64':  
195        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
196        if env['CXX'] == 'icpc':        if env['CXX'] == 'icpc':
197           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not)           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not)
198     else:     else:
199        env = Environment(tools = ['default'], options = opts)        env = Environment(tools = ['default'], options = opts)
200          if env['tools_names']!='default':
201        env=Environment(tools = ['default'] +env['tools_names'], options=opts)
202    
203    
204    
205    
206  # Override compiler choice if provided  # Override compiler choice if provided
207  if env['cc'] != 'DEFAULT': env['CC']=env['cc']  if env['cc'] != 'DEFAULT': env['CC']=env['cc']

Legend:
Removed from v.3039  
changed lines
  Added in v.3076

  ViewVC Help
Powered by ViewVC 1.1.26