diff options
author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2016-12-19 01:02:41 -0500 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-19 14:07:25 +0200 |
commit | 51e6a3986a1385b325545133f59fbbf8fdfd5a38 (patch) | |
tree | a3365d7bd6225df413cbc8757ea046d4a3fd9898 | |
parent | 534066af1a1a970e51f11fd7ed013aeacbdf0192 (diff) | |
download | meson-51e6a3986a1385b325545133f59fbbf8fdfd5a38.zip meson-51e6a3986a1385b325545133f59fbbf8fdfd5a38.tar.gz meson-51e6a3986a1385b325545133f59fbbf8fdfd5a38.tar.bz2 |
Fix undefined variables in cross-compile.
-rw-r--r-- | mesonbuild/compilers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index e209378..54c1300 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -859,11 +859,11 @@ int main(int argc, char **argv) {{ %s int temparray[%d-sizeof(%s)]; ''' - if not self.compiles(element_exists_templ.format(prefix, element), env, args, dependencies): + if not self.compiles(element_exists_templ.format(prefix, element), env, extra_args, dependencies): return -1 for i in range(1, 1024): code = templ % (prefix, i, element) - if self.compiles(code, env, args, dependencies): + if self.compiles(code, env, extra_args, dependencies): if self.id == 'msvc': # MSVC refuses to construct an array of zero size, so # the test only succeeds when i is sizeof(element) + 1 @@ -907,11 +907,11 @@ struct tmp { int testarray[%d-offsetof(struct tmp, target)]; ''' - if not self.compiles(type_exists_templ.format(typename), env, args, dependencies): + if not self.compiles(type_exists_templ.format(typename), env, extra_args, dependencies): return -1 for i in range(1, 1024): code = templ % (typename, i) - if self.compiles(code, env, args, dependencies): + if self.compiles(code, env, extra_args, dependencies): if self.id == 'msvc': # MSVC refuses to construct an array of zero size, so # the test only succeeds when i is sizeof(element) + 1 |