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

Diff of /branches/refine/SConstruct

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

revision 1459 by ksteube, Thu Mar 27 01:49:10 2008 UTC revision 1560 by ksteube, Wed May 21 05:55:30 2008 UTC
# Line 297  if IS_WINDOWS_PLATFORM: Line 297  if IS_WINDOWS_PLATFORM:
297        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(tools = ['default', 'msvc'], options = opts)
298        #env = Environment(tools = ['default', 'intelc'], options = opts)        #env = Environment(tools = ['default', 'intelc'], options = opts)
299  else:  else:
300     if os.uname()[4]=='ia64':     if socket.gethostname().split('.')[0] == 'service0':
301          env = Environment(tools = ['default', 'intelc'], options = opts)
302       elif os.uname()[4]=='ia64':
303        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
304        if env['CXX'] == 'icpc':        if env['CXX'] == 'icpc':
305           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 356  except KeyError: Line 358  except KeyError:
358    
359  try:  try:
360     tmp = os.environ['LD_LIBRARY_PATH']     tmp = os.environ['LD_LIBRARY_PATH']
    print tmp  
361     env['ENV']['LD_LIBRARY_PATH'] = tmp     env['ENV']['LD_LIBRARY_PATH'] = tmp
362  except KeyError:  except KeyError:
363     pass     pass
# Line 754  except KeyError: Line 755  except KeyError:
755     papi_libs = None     papi_libs = None
756  # ============= set mpi =====================================  # ============= set mpi =====================================
757  if useMPI:  if useMPI:
758     env.Append(CPPDEFINES=['PASO_MPI',])     env.Append(CPPDEFINES=['PASO_MPI', 'MPI_NO_CPPBIND'])
759     try:     try:
760        includes = env['mpi_path']        includes = env['mpi_path']
761        env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])

Legend:
Removed from v.1459  
changed lines
  Added in v.1560

  ViewVC Help
Powered by ViewVC 1.1.26