Skip to content

Commit

Permalink
buildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded name
Browse files Browse the repository at this point in the history
waflib.Build provides CACHE_SUFFIX constant to append to the target
name. We have a reference to samba-specific cache suffix (.cache.py)
while original WAF uses _cache.py as a cache suffix since 2011 (see
commit 44a967e326cc2e670a31b3712e4763b72d65e81b in WAF project code).

Signed-off-by: Alexander Bokovoy <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
  • Loading branch information
abbra authored and abartlet committed Sep 5, 2018
1 parent 6fc9f1a commit 72c3ff9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion buildtools/wafsamba/samba_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from waflib.Configure import ConfigurationContext
from waflib.Logs import debug
from waflib import ConfigSet
from waflib.Build import CACHE_SUFFIX

# TODO: make this a --option
LIB_PATH="shared"
Expand Down Expand Up @@ -393,7 +394,7 @@ def LOAD_ENVIRONMENT():
from new commands'''
env = ConfigSet.ConfigSet()
try:
p = os.path.join(Context.g_module.out, 'c4che/default_cache.py')
p = os.path.join(Context.g_module.out, 'c4che/default'+CACHE_SUFFIX)
env.load(p)
except (OSError, IOError):
pass
Expand Down

0 comments on commit 72c3ff9

Please sign in to comment.