summaryrefslogtreecommitdiff
path: root/libs/timecode
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 /libs/timecode
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 'libs/timecode')
-rw-r--r--libs/timecode/wscript5
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/timecode/wscript b/libs/timecode/wscript
index f919649e25..034292b1dd 100644
--- a/libs/timecode/wscript
+++ b/libs/timecode/wscript
@@ -1,6 +1,6 @@
#!/usr/bin/env python
from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
import os
# Version of this package (even if built as a child)
@@ -26,10 +26,9 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
+ conf.load('compiler_cxx')
autowaf.configure(conf)
- conf.check_tool('compiler_cxx')
-
def build(bld):
# Library
obj = bld(features = 'cxx cxxshlib')