Update to work with waf-1.7.0.

2 files changed, 10 insertions, 13 deletions

diff --git a/rtems.py b/rtems.py
index 3043e14..01c61e9 100644
--- a/rtems.py
+++ b/rtems.py
@@ -104,13 +104,10 @@ def configure(conf):
 
     tools = _find_tools(conf, archs, rtems_tools)
 
-    env_clean = conf.env.copy()
+    env = conf.env
 
     for ab in arch_bsps:
-        env = env_clean
-        env.set_variant(ab)
-        conf.set_env_name(ab, env)
-        conf.setenv(ab)
+        conf.setenv(ab, env)
 
         arch = _arch_from_arch_bsp(ab)
 
@@ -146,7 +143,7 @@ def configure(conf):
 
         conf.env.SHOW_COMMANDS = show_commands
 
-    conf.setenv('')
+    conf.setenv('', env)
 
     conf.env.RTEMS_TOOLS = rtems_tools
     conf.env.ARCHS = archs
diff --git a/wscript b/wscript
index 880639f..7584fa5 100644
--- a/wscript
+++ b/wscript
@@ -139,10 +139,10 @@ def rtl_gsyms(bld):
         source = ['rtld-gsyms.c'],
         depends_on = 'gsyms')
 
-import TaskGen
-TaskGen.declare_chain(name      = 'html',
-                      rule      = '${ASCIIDOC} ${ASCIIDOC_FLAGS} -o ${TGT} ${SRC}',
-                      shell     = False,
-                      ext_in    = '.txt',
-                      ext_out   = '.html',
-                      reentrant = False)
+import waflib.TaskGen
+waflib.TaskGen.declare_chain(name      = 'html',
+                             rule      = '${ASCIIDOC} ${ASCIIDOC_FLAGS} -o ${TGT} ${SRC}',
+                             shell     = False,
+                             ext_in    = '.txt',
+                             ext_out   = '.html',
+                             reentrant = False)