summaryrefslogtreecommitdiffstats
path: root/Scripting.py
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-11-25 16:50:59 +0100
committerDavid Robillard <d@drobilla.net>2020-11-25 16:50:59 +0100
commitefb12030a1179dfd567f6c1b737a49291eebe19d (patch)
tree425f2054fd9292f0831c04e3c8416a6d92657ebc /Scripting.py
parentd19992202543ebb810609c074f754b5ec48c0fd7 (diff)
downloadautowaf-efb12030a1179dfd567f6c1b737a49291eebe19d.tar.gz
autowaf-efb12030a1179dfd567f6c1b737a49291eebe19d.tar.bz2
autowaf-efb12030a1179dfd567f6c1b737a49291eebe19d.zip
Upgrade to waf 2.0.21
Diffstat (limited to 'Scripting.py')
-rw-r--r--Scripting.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Scripting.py b/Scripting.py
index 68dccf2..da83a21 100644
--- a/Scripting.py
+++ b/Scripting.py
@@ -306,7 +306,7 @@ def distclean(ctx):
# remove a build folder, if any
cur = '.'
- if ctx.options.no_lock_in_top:
+ if os.environ.get('NO_LOCK_IN_TOP') or ctx.options.no_lock_in_top:
cur = ctx.options.out
try:
@@ -333,9 +333,9 @@ def distclean(ctx):
remove_and_log(env.out_dir, shutil.rmtree)
env_dirs = [env.out_dir]
- if not ctx.options.no_lock_in_top:
+ if not (os.environ.get('NO_LOCK_IN_TOP') or ctx.options.no_lock_in_top):
env_dirs.append(env.top_dir)
- if not ctx.options.no_lock_in_run:
+ if not (os.environ.get('NO_LOCK_IN_RUN') or ctx.options.no_lock_in_run):
env_dirs.append(env.run_dir)
for k in env_dirs:
p = os.path.join(k, Options.lockfile)