aboutsummaryrefslogtreecommitdiffstats
path: root/waflib/Configure.py
diff options
context:
space:
mode:
Diffstat (limited to 'waflib/Configure.py')
-rw-r--r--waflib/Configure.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/waflib/Configure.py b/waflib/Configure.py
index d0a4793a..db09c0e3 100644
--- a/waflib/Configure.py
+++ b/waflib/Configure.py
@@ -125,7 +125,7 @@ class ConfigurationContext(Context.Context):
self.bldnode.mkdir()
if not os.path.isdir(self.bldnode.abspath()):
- conf.fatal('Could not create the build directory %s' % self.bldnode.abspath())
+ self.fatal('Could not create the build directory %s' % self.bldnode.abspath())
def execute(self):
"""
@@ -180,6 +180,7 @@ class ConfigurationContext(Context.Context):
env.hash = self.hash
env.files = self.files
env.environ = dict(self.environ)
+ env.launch_dir = Context.launch_dir
if not (self.env.NO_LOCK_IN_RUN or env.environ.get('NO_LOCK_IN_RUN') or getattr(Options.options, 'no_lock_in_run')):
env.store(os.path.join(Context.run_dir, Options.lockfile))