Upgrade to WAF 1.5.16. Fixes bug #855.
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Fri, 23 Apr 2010 15:46:46 +0100
changeset 62743e8b3f2306c9
parent 6273 8d70de29d514
child 6275 77f833c7ddae
Upgrade to WAF 1.5.16. Fixes bug #855.
waf
wscript
     1.1 Binary file waf has changed
     2.1 --- a/wscript	Fri Apr 23 15:09:31 2010 +0400
     2.2 +++ b/wscript	Fri Apr 23 15:46:46 2010 +0100
     2.3 @@ -28,8 +28,11 @@
     2.4  import Scripting
     2.5  
     2.6  sys.path.insert(0, os.path.abspath('waf-tools'))
     2.7 +try:
     2.8 +    import cflags # override the build profiles from waf
     2.9 +finally:
    2.10 +    sys.path.pop(0)
    2.11  
    2.12 -import cflags # override the build profiles from waf
    2.13  cflags.profiles = {
    2.14  	# profile name: [optimization_level, warnings_level, debug_level]
    2.15  	'debug':     [0, 2, 3],
    2.16 @@ -248,12 +251,12 @@
    2.17      conf.env['NS3_BUILDDIR'] = conf.blddir
    2.18      conf.check_tool('compiler_cc')
    2.19      conf.check_tool('compiler_cxx')
    2.20 -    conf.check_tool('cflags')
    2.21 +    conf.check_tool('cflags', ['waf-tools'])
    2.22      try:
    2.23 -        conf.check_tool('pkgconfig')
    2.24 +        conf.check_tool('pkgconfig', ['waf-tools'])
    2.25      except Configure.ConfigurationError:
    2.26          pass
    2.27 -    conf.check_tool('command')
    2.28 +    conf.check_tool('command', ['waf-tools'])
    2.29  
    2.30      # Check for the location of regression reference traces
    2.31      if Options.options.regression_traces is not None: