buildtools/wafsamba: use context instead of options for cross-compile checks for...
authorAlexander Bokovoy <ab@samba.org>
Wed, 27 Jun 2018 13:42:29 +0000 (16:42 +0300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 5 Sep 2018 04:37:27 +0000 (06:37 +0200)
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
buildtools/wafsamba/samba_cross.py

index b4643c0..eee3117 100644 (file)
@@ -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")