summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorGaurav Juvekar <gauravjuvekar@gmail.com>2017-05-11 19:45:41 (GMT)
committerGaurav Juvekar <gauravjuvekar@gmail.com>2017-05-11 19:45:41 (GMT)
commit9cbe55b4a57503435e18d1b56608dc0564641b47 (patch)
tree0ed18bd01b281683f730f860a2c2cee1392251e9 /src/engine
parent43383ea01595a910c38e28dacb1c84bc690eb236 (diff)
downloadSCons-9cbe55b4a57503435e18d1b56608dc0564641b47.zip
SCons-9cbe55b4a57503435e18d1b56608dc0564641b47.tar.gz
SCons-9cbe55b4a57503435e18d1b56608dc0564641b47.tar.bz2
Fix #2832 - Expand construction variables in chdir argument of Builders
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Builder.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index 6f606ee..21f1b4a 100644
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -610,6 +610,8 @@ class BuilderBase(object):
else:
ekw = self.executor_kw.copy()
ekw['chdir'] = chdir
+ if 'chdir' in ekw and SCons.Util.is_String(ekw['chdir']):
+ ekw['chdir'] = env.subst(ekw['chdir'])
if kw:
if 'srcdir' in kw:
def prependDirIfRelative(f, srcdir=kw['srcdir']):