diff options
author | Volker Weißmann <volker.weissmann@gmx.de> | 2023-03-18 13:30:08 +0100 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2023-03-18 09:47:05 -0400 |
commit | 193a12e3668236ef17c107362bf973c781069c29 (patch) | |
tree | 57f85b8114e0014804b73c40661c8f7e87921d65 | |
parent | bb27341cd0f296b2c11f46451c8702ce63e7d512 (diff) | |
download | meson-193a12e3668236ef17c107362bf973c781069c29.zip meson-193a12e3668236ef17c107362bf973c781069c29.tar.gz meson-193a12e3668236ef17c107362bf973c781069c29.tar.bz2 |
Small fix on how cc.sizeof (and similar functions) use the 'prefix' kwarg
-rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index d41c274..e3579a9 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -498,8 +498,8 @@ class CLikeCompiler(Compiler): def _compile_int(self, expression: str, prefix: str, env: 'Environment', extra_args: T.Union[None, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]], dependencies: T.Optional[T.List['Dependency']]) -> bool: - t = f'''#include <stdio.h> - {prefix} + t = f'''{prefix} + #include <stdio.h> int main(void) {{ static int a[1-2*!({expression})]; a[0]=0; return 0; }}''' return self.compiles(t, env, extra_args=extra_args, dependencies=dependencies)[0] @@ -559,8 +559,8 @@ class CLikeCompiler(Compiler): extra_args = [] if self.is_cross: return self.cross_compute_int(expression, low, high, guess, prefix, env, extra_args, dependencies) - t = f'''#include<stdio.h> - {prefix} + t = f'''{prefix} + #include<stdio.h> int main(void) {{ printf("%ld\\n", (long)({expression})); return 0; @@ -578,8 +578,8 @@ class CLikeCompiler(Compiler): dependencies: T.Optional[T.List['Dependency']] = None) -> int: if extra_args is None: extra_args = [] - t = f'''#include <stdio.h> - {prefix} + t = f'''{prefix} + #include <stdio.h> int main(void) {{ {typename} something; return 0; @@ -598,8 +598,8 @@ class CLikeCompiler(Compiler): r = self.cross_sizeof(typename, prefix, env, extra_args=extra_args, dependencies=dependencies) return r, False - t = f'''#include<stdio.h> - {prefix} + t = f'''{prefix} + #include<stdio.h> int main(void) {{ printf("%ld\\n", (long)(sizeof({typename}))); return 0; @@ -617,8 +617,8 @@ class CLikeCompiler(Compiler): dependencies: T.Optional[T.List['Dependency']] = None) -> int: if extra_args is None: extra_args = [] - t = f'''#include <stdio.h> - {prefix} + t = f'''{prefix} + #include <stdio.h> int main(void) {{ {typename} something; return 0; @@ -626,8 +626,8 @@ class CLikeCompiler(Compiler): if not self.compiles(t, env, extra_args=extra_args, dependencies=dependencies)[0]: return -1 - t = f'''#include <stddef.h> - {prefix} + t = f'''{prefix} + #include <stddef.h> struct tmp {{ char c; {typename} target; @@ -643,9 +643,9 @@ class CLikeCompiler(Compiler): r = self.cross_alignment(typename, prefix, env, extra_args=extra_args, dependencies=dependencies) return r, False - t = f'''#include <stdio.h> + t = f'''{prefix} + #include <stdio.h> #include <stddef.h> - {prefix} struct tmp {{ char c; {typename} target; |