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

Diff of /branches/cookbookdev/SConstruct

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

revision 2054 by phornby, Mon Nov 17 13:20:41 2008 UTC revision 2100 by gross, Wed Nov 26 08:13:00 2008 UTC
# Line 176  if env["CC"] == "icc": Line 176  if env["CC"] == "icc":
176    fatalwarning      = ""        # Switch to turn warnings into errors    fatalwarning      = ""        # Switch to turn warnings into errors
177  elif env["CC"] == "gcc":  elif env["CC"] == "gcc":
178    # GNU C on any system    # GNU C on any system
179    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER -isystem " + env['boost_path'] + " -isystem " + env['python_path'] + " -Wno-sign-compare -Wno-system-headers -Wno-strict-aliasing"    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER -isystem " + env['boost_path'] + "/boost -isystem " + env['python_path'] + " -Wno-sign-compare -Wno-system-headers -Wno-strict-aliasing -Wno-long-long"
180  #the strict aliasing warning is triggered by some type punning in the boost headers for version 1.34  #the strict aliasing warning is triggered by some type punning in the boost headers for version 1.34
181  #isystem does not seem to prevent this  #isystem does not seem to prevent this
182    #the long long warning occurs on the Mac
183    cc_optim      = "-O3"    cc_optim      = "-O3"
184    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
185    omp_optim     = ""    omp_optim     = ""
# Line 447  if env['useumfpack']: Line 448  if env['useumfpack']:
448    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['amd_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['amd_lib_path'])   # The wrapper script needs to find these libs
449    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['blas_lib_path'])  # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['blas_lib_path'])  # The wrapper script needs to find these libs
450    
451  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  # if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
452  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0  # if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0
453    # if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0
454    
455  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
456  if env['useumfpack']:  if env['useumfpack']:

Legend:
Removed from v.2054  
changed lines
  Added in v.2100

  ViewVC Help
Powered by ViewVC 1.1.26