/[escript]/branches/windows_from_1456_trunk_1574_merged_in/SConstruct
ViewVC logotype

Diff of /branches/windows_from_1456_trunk_1574_merged_in/SConstruct

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

revision 1546 by phornby, Thu May 1 07:09:49 2008 UTC revision 1576 by phornby, Wed May 28 11:10:51 2008 UTC
# Line 300  if IS_WINDOWS_PLATFORM: Line 300  if IS_WINDOWS_PLATFORM:
300        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(tools = ['default', 'msvc'], options = opts)
301        #env = Environment(tools = ['default', 'intelc'], options = opts)        #env = Environment(tools = ['default', 'intelc'], options = opts)
302  else:  else:
303     if os.uname()[4]=='ia64':     if socket.gethostname().split('.')[0] == 'service0':
304          env = Environment(tools = ['default', 'intelc'], options = opts)
305       elif os.uname()[4]=='ia64':
306        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
307        if env['CXX'] == 'icpc':        if env['CXX'] == 'icpc':
308           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
# Line 359  except KeyError: Line 361  except KeyError:
361    
362  try:  try:
363     tmp = os.environ['LD_LIBRARY_PATH']     tmp = os.environ['LD_LIBRARY_PATH']
    print tmp  
364     env['ENV']['LD_LIBRARY_PATH'] = tmp     env['ENV']['LD_LIBRARY_PATH'] = tmp
365  except KeyError:  except KeyError:
366     pass     pass
# Line 769  except KeyError: Line 770  except KeyError:
770     papi_libs = None     papi_libs = None
771  # ============= set mpi =====================================  # ============= set mpi =====================================
772  if useMPI:  if useMPI:
773     env.Append(CPPDEFINES=['PASO_MPI',])     env.Append(CPPDEFINES=['PASO_MPI', 'MPI_NO_CPPBIND'])
774     try:     try:
775        includes = env['mpi_path']        includes = env['mpi_path']
776        env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])

Legend:
Removed from v.1546  
changed lines
  Added in v.1576

  ViewVC Help
Powered by ViewVC 1.1.26