diff options
| author | Uri Simchoni <uri@samba.org> | 2019-10-07 00:37:17 +0300 |
|---|---|---|
| committer | Uri Simchoni <uri@samba.org> | 2019-10-20 12:06:30 +0000 |
| commit | e00e93350288dc212fed3f1be2adf78dcb6e58e7 (patch) | |
| tree | 8c017074a4fefd0a8975f9d1db7bfad036f697c5 /buildtools | |
| parent | 09e282ec8173f2935bdb579e0396f269ce712e0d (diff) | |
| download | samba-e00e93350288dc212fed3f1be2adf78dcb6e58e7.tar.gz | |
wafsamba: use test_args instead of exec_args to support cross-compilation
exec_args seems to have been a custom addition to Samba's copy of waf.
Upstream Waf has an identically-purposed parameter called test_args.
This parameter is being used for addiing runtime args to test programs that
are being run during configuration phases.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13846
Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 6 | ||||
| -rw-r--r-- | buildtools/wafsamba/samba_cross.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 63664a41160..683f0d5316b 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -422,9 +422,9 @@ def CHECK_CODE(conf, code, define, cflags.extend(ccflags) if on_target: - exec_args = conf.SAMBA_CROSS_ARGS(msg=msg) + test_args = conf.SAMBA_CROSS_ARGS(msg=msg) else: - exec_args = [] + test_args = [] conf.COMPOUND_START(msg) @@ -439,7 +439,7 @@ def CHECK_CODE(conf, code, define, type=type, msg=msg, quote=quote, - exec_args=exec_args, + test_args=test_args, define_ret=define_ret) except Exception: if always: diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py index 8863c2c53e7..60ddf967237 100644 --- a/buildtools/wafsamba/samba_cross.py +++ b/buildtools/wafsamba/samba_cross.py @@ -139,7 +139,7 @@ class cross_Popen(Utils.subprocess.Popen): @conf def SAMBA_CROSS_ARGS(conf, msg=None): - '''get exec_args to pass when running cross compiled binaries''' + '''get test_args to pass when running cross compiled binaries''' if not conf.env.CROSS_COMPILE: return [] |