summaryrefslogtreecommitdiff
path: root/tools/sanity_check
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-09-29 19:58:05 +0000
committerDavid Robillard <d@drobilla.net>2011-09-29 19:58:05 +0000
commitc1ef7b14a3e1200817180cfaf6425e9bdf0eb51b (patch)
treefe7355824aa3c2640b2ae016ac242997763ec41e /tools/sanity_check
parent723ab60b39aed9a9190e047fc5803c1f4e1adac3 (diff)
Remove use of waf compat15 tool.
Always load waf tools first (prevent smashing of --debug, DATADIR, etc). git-svn-id: svn://localhost/ardour2/branches/3.0@10163 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools/sanity_check')
-rw-r--r--tools/sanity_check/wscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/sanity_check/wscript b/tools/sanity_check/wscript
index fdfd7cfc2c..6bb2274f3f 100644
--- a/tools/sanity_check/wscript
+++ b/tools/sanity_check/wscript
@@ -1,6 +1,6 @@
#!/usr/bin/env python
from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
import os
# Mandatory variables
@@ -11,8 +11,8 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
- autowaf.configure (conf)
- conf.check_tool('compiler_cxx')
+ conf.load('compiler_cxx')
+ autowaf.configure(conf)
def build(bld):
obj = bld(features = 'cxx cxxprogram')