/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1149 by gross, Thu May 17 00:30:15 2007 UTC revision 1185 by gross, Thu May 31 04:33:31 2007 UTC
# Line 98  else: Line 98  else:
98  #  #
99  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
100     python_path_default=os.path.join(tools_prefix,'python%s%s'%(sys.version_info[0],sys.version_info[1]),"include")     python_path_default=os.path.join(tools_prefix,'python%s%s'%(sys.version_info[0],sys.version_info[1]),"include")
101     python_lib_path_default=os.path.join(tools_prefix,'python%s%s'%(sys.version_info[0],sys.version_info[1])+"libs")     python_lib_path_default=os.path.join(tools_prefix,'python%s%s'%(sys.version_info[0],sys.version_info[1]),"libs")
102     python_libs_default=["python%s%s"%(sys.version_info[0],sys.version_info[1])]     python_libs_default=["python%s%s"%(sys.version_info[0],sys.version_info[1])]
103  else:  else:
104     python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))     python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))
# Line 274  except KeyError: Line 274  except KeyError:
274     python_path = ''     python_path = ''
275    
276  try:  try:
277       omp_num_threads = os.environ['OMP_NUM_THREADS']
278    except KeyError:
279       omp_num_threads = 1
280    env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
281    
282    try:
283       env['ENV']['DISPLAY'] = os.environ['DISPLAY']
284       env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']
285    except KeyError:
286       pass
287    
288    try:
289     path = os.environ['PATH']     path = os.environ['PATH']
290     env['ENV']['PATH'] = path     env['ENV']['PATH'] = path
291  except KeyError:  except KeyError:

Legend:
Removed from v.1149  
changed lines
  Added in v.1185

  ViewVC Help
Powered by ViewVC 1.1.26