From 7aa24c7d0a68959e4d29c41d157ee30ff97153ad Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 26 May 2016 03:01:51 +0530 Subject: compilers: Fix header stub change that broke has_function checks on Windows (#559) Fixes https://github.com/mesonbuild/meson/issues/558 --- mesonbuild/compilers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/compilers.py') diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 241192e..458a579 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -755,7 +755,8 @@ int main(int argc, char **argv) { # redefines the symbol to be something else. In that case, we want to # still detect the function. We still want to fail if __stub_foo or # _stub_foo are defined, of course. - if self.links('{0}\n' + stubs_fail + '\nint main() {{ {1}; }}'.format(prefix, funcname), extra_args): + header_templ = '#include \n{0}\n' + stubs_fail + '\nint main() {{ {1}; }}' + if self.links(header_templ.format(prefix, funcname), extra_args): return True # Some functions like alloca() are defined as compiler built-ins which # are inlined by the compiler, so test for that instead. Built-ins are -- cgit v1.1