diff options
| author | Sam James <sam@gentoo.org> | 2024-06-23 22:19:14 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-06-24 00:32:24 +0100 |
| commit | b56a3198b4e8e8a6738dc372bddc66225abc20f9 (patch) | |
| tree | 65a5fa35b81e7efbafdabfc62f0a3d0835f4d9ad | |
| parent | 4cebb77e1ed264555c898505a79bd252533dfe49 (diff) | |
| download | meson-b56a3198b4e8e8a6738dc372bddc66225abc20f9.zip meson-b56a3198b4e8e8a6738dc372bddc66225abc20f9.tar.gz meson-b56a3198b4e8e8a6738dc372bddc66225abc20f9.tar.bz2 | |
compilers: detect: fix comment/error string in _get_gnu_compiler_defines
Make the debug & error message strings consistent between the GCC and Clang probes.
Copy-paste error. Here, we're scraping pre-processor tokens, not checking
for the compiler type.
| -rw-r--r-- | mesonbuild/compilers/detect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 4cb8a6f..f16e40f 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -1331,7 +1331,7 @@ def detect_masm_compiler(env: 'Environment', for_machine: MachineChoice) -> Comp def _get_gnu_compiler_defines(compiler: T.List[str]) -> T.Dict[str, str]: """ - Detect GNU compiler platform type (Apple, MinGW, Unix) + Get the list of GCC pre-processor defines """ # Arguments to output compiler pre-processor defines to stdout # gcc, g++, and gfortran all support these arguments @@ -1339,7 +1339,7 @@ def _get_gnu_compiler_defines(compiler: T.List[str]) -> T.Dict[str, str]: mlog.debug(f'Running command: {join_args(args)}') p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE) if p.returncode != 0: - raise EnvironmentException('Unable to detect GNU compiler type:\n' + raise EnvironmentException('Unable to detect gcc pre-processor defines:\n' f'Compiler stdout:\n{output}\n-----\n' f'Compiler stderr:\n{error}\n-----\n') # Parse several lines of the type: |