diff options
| author | Alexander Bokovoy <ab@samba.org> | 2018-06-27 16:42:29 +0300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-05 06:37:27 +0200 |
| commit | 1d25ae580b4a625c8ce0ab183c04d599090ee073 (patch) | |
| tree | 8829d9fb4745f4a66e13fe60a05cba5fe9d8443c | |
| parent | aebcd698764d9c8e55db14b7650481a1992ee938 (diff) | |
| download | samba-1d25ae580b4a625c8ce0ab183c04d599090ee073.tar.gz | |
buildtools/wafsamba: use context instead of options for cross-compile checks for waf 2.0
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | buildtools/wafsamba/samba_cross.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py index b4643c037d9..eee31179fed 100644 --- a/buildtools/wafsamba/samba_cross.py +++ b/buildtools/wafsamba/samba_cross.py @@ -1,7 +1,7 @@ # functions for handling cross-compilation import os, sys, re, shlex -from waflib import Utils, Logs, Options, Errors +from waflib import Utils, Logs, Options, Errors, Context from waflib.Configure import conf real_Popen = None @@ -155,7 +155,7 @@ def SAMBA_CROSS_ARGS(conf, msg=None): if conf.env.CROSS_ANSWERS: if msg is None: raise Errors.WafError("Cannot have NULL msg in cross-answers") - ret.extend(['--cross-answers', os.path.join(Options.launch_dir, conf.env.CROSS_ANSWERS), msg]) + ret.extend(['--cross-answers', os.path.join(Context.launch_dir, conf.env.CROSS_ANSWERS), msg]) if ret == []: raise Errors.WafError("Cannot cross-compile without either --cross-execute or --cross-answers") |