aboutsummaryrefslogtreecommitdiffstats
path: root/waflib/TaskGen.py
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-17 17:31:03 +0100
committerDavid Robillard <d@drobilla.net>2019-03-17 18:14:27 +0100
commit3be2dd998b16725d596f0ab8b376691ec12a9acc (patch)
tree59603e6135700e9b9f129409a55ad44a580d7427 /waflib/TaskGen.py
parenta13822206d4dfd2088468558b36befcf32adeb89 (diff)
parentadeace4871fcf37ba7c8d7c2707e90b5ae2c9f3a (diff)
downloadmachina-master.tar.gz
machina-master.tar.bz2
machina-master.zip
Update autowaf and adapt to new APIHEADmaster
Diffstat (limited to 'waflib/TaskGen.py')
-rw-r--r--waflib/TaskGen.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py
index a74e643..532b7d5 100644
--- a/waflib/TaskGen.py
+++ b/waflib/TaskGen.py
@@ -74,7 +74,7 @@ class task_gen(object):
else:
self.bld = kw['bld']
self.env = self.bld.env.derive()
- self.path = self.bld.path # emulate chdir when reading scripts
+ self.path = kw.get('path', self.bld.path) # by default, emulate chdir when reading scripts
# Provide a unique index per folder
# This is part of a measure to prevent output file name collisions
@@ -727,7 +727,7 @@ def sequence_order(self):
self.bld.prev = self
-re_m4 = re.compile('@(\w+)@', re.M)
+re_m4 = re.compile(r'@(\w+)@', re.M)
class subst_pc(Task.Task):
"""