summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAliaksei Karaliou <akaraliou@panasas.com>2018-12-27 04:51:41 -0500
committerAndrew Bartlett <abartlet@samba.org>2019-02-11 07:43:31 +0100
commitb50f8390eba23b2ec310c495cf67a96b47ba9966 (patch)
tree18605a7bb0f082bdeee6e443c71931821b000d2f /buildtools
parent835e1564943b3a8a0c8cbdc55db5f0d070ba8f17 (diff)
downloadsamba-b50f8390eba23b2ec310c495cf67a96b47ba9966.tar.gz
build: Fixed usage of non-default path to WAFLOCK
If WAFLOCK environment variable is set, use it to override path to WAF lock file in Samba build scripts. Signed-off-by: Aliaksei Karaliou <akaraliou@panasas.com> Reviewed-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index bc36d1f194d..93ce317f114 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -590,7 +590,7 @@ def load_file(filename):
def reconfigure(ctx):
'''rerun configure if necessary'''
- if not os.path.exists(".lock-wscript"):
+ if not os.path.exists(os.environ.get('WAFLOCK', '.lock-wscript')):
raise Errors.WafError('configure has not been run')
import samba_wildcard
bld = samba_wildcard.fake_build_environment()