/[escript]/trunk-mpi-branch/SConstruct
ViewVC logotype

Diff of /trunk-mpi-branch/SConstruct

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

revision 1011 by gross, Tue Mar 6 04:41:55 2007 UTC revision 1013 by ksteube, Wed Mar 7 03:34:42 2007 UTC
# Line 82  opts.AddOptions( Line 82  opts.AddOptions(
82    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
83    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/hostname_options.py)", options_file),    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/hostname_options.py)", options_file),
84    ('cc_defines','C/C++ defines to use', None),    ('cc_defines','C/C++ defines to use', None),
85    ('cc_flags','C compiler flags to use (Release build)', '-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas'),    ('cc_flags','C compiler flags to use (Release build)', '-O3 -std=c99 -ffast-math -fPIC -Wno-unknown-pragmas'),
86    ('cc_flags_debug', 'C compiler flags to use (Debug build)', '-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas'),    ('cc_flags_debug', 'C compiler flags to use (Debug build)', '-g -O0 -ffast-math -std=c99 -fPIC -Wno-unknown-pragmas'),
87    ('cxx_flags', 'C++ compiler flags to use (Release build)', '--no-warn -ansi'),    ('cxx_flags', 'C++ compiler flags to use (Release build)', '--no-warn -ansi'),
88    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', '--no-warn -ansi -DDOASSERT -DDOPROF'),    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', '--no-warn -ansi -DDOASSERT -DDOPROF'),
89    ('ar_flags', 'Static library archiver flags to use', None),    ('ar_flags', 'Static library archiver flags to use', None),
# Line 230  try: Line 230  try:
230  except KeyError:  except KeyError:
231     pass     pass
232    
 if 'shake71' == socket.gethostname().split('.')[0]:  
   if useMPI:  
     env['CC'] = 'mpicc'  
     env['CXX'] = 'mpiCC'  
   
233  # mpi?  # mpi?
234  if useMPI:  if useMPI:
235     env.Append(CPPDEFINES=['PASO_MPI',])     env.Append(CPPDEFINES=['PASO_MPI',])
# Line 272  except KeyError: Line 267  except KeyError:
267  try:  try:
268     sys_libs = env['sys_libs']     sys_libs = env['sys_libs']
269  except KeyError:  except KeyError:
270     sys_libs = ''     sys_libs = []
271    
272  try:  try:
273     tar_flags = env['tar_flags']     tar_flags = env['tar_flags']

Legend:
Removed from v.1011  
changed lines
  Added in v.1013

  ViewVC Help
Powered by ViewVC 1.1.26