/[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 5044 by sshaw, Tue Jun 10 02:16:18 2014 UTC revision 5045 by caltinay, Fri Jun 13 02:53:39 2014 UTC
# Line 153  env = Environment(tools = ['default'], o Line 153  env = Environment(tools = ['default'], o
153  def mkclang(env):  def mkclang(env):
154      env['CXX']='clang++'      env['CXX']='clang++'
155    
156  if env['tools_names'] != 'default':  if env['tools_names'] != ['default']:
157      zz=env['tools_names']      zz=env['tools_names']
158      if 'clang' in zz:      if 'clang' in zz:
159          zz.remove('clang')          zz.remove('clang')
# Line 370  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N Line 370  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N
370      try:      try:
371          env['ENV'][key] = os.environ[key]          env['ENV'][key] = os.environ[key]
372      except KeyError:      except KeyError:
373          env['ENV'][key] = 1          env['ENV'][key] = '1'
374    
375  env_export=env['env_export']  env_export=env['env_export']
376  env_export.extend(['ESCRIPT_NUM_THREADS','ESCRIPT_HOSTFILE','DISPLAY','XAUTHORITY','PATH','HOME','KMP_MONITOR_STACKSIZE','TMPDIR','TEMP','TMP','LD_PRELOAD'])  env_export.extend(['ESCRIPT_NUM_THREADS','ESCRIPT_HOSTFILE','DISPLAY','XAUTHORITY','PATH','HOME','KMP_MONITOR_STACKSIZE','TMPDIR','TEMP','TMP','LD_PRELOAD'])

Legend:
Removed from v.5044  
changed lines
  Added in v.5045

  ViewVC Help
Powered by ViewVC 1.1.26