mirror of https://gitlab.com/ita1024/waf.git
fix the regression made by changing the lock file name
This commit is contained in:
parent
dfd5872e62
commit
5b38195885
|
@ -170,7 +170,7 @@ class ConfigurationContext(Context.Context):
|
|||
if not out:
|
||||
out = getattr(Context.g_module, Context.OUT, None)
|
||||
if not out:
|
||||
out = Options.lockfile.replace('.lock-waf', '')
|
||||
out = Options.lockfile.replace('.lock-waf_%s_' % sys.platform, '').replace('.lock-waf', '')
|
||||
|
||||
self.bldnode = (os.path.isabs(out) and self.root or self.path).make_node(out)
|
||||
self.bldnode.mkdir()
|
||||
|
|
|
@ -35,7 +35,7 @@ commands = []
|
|||
List of commands to execute extracted from the command-line. This list is consumed during the execution, see :py:func:`waflib.Scripting.run_commands`.
|
||||
"""
|
||||
|
||||
lockfile = os.environ.get('WAFLOCK', '.lock-wafbuild%s' % sys.platform)
|
||||
lockfile = os.environ.get('WAFLOCK', '.lock-waf_%s_build' % sys.platform)
|
||||
try: cache_global = os.path.abspath(os.environ['WAFCACHE'])
|
||||
except KeyError: cache_global = ''
|
||||
platform = Utils.unversioned_sys_platform()
|
||||
|
|
Loading…
Reference in New Issue