On Mon, May 19, 2025 at 01:09:42PM -0400, Eli Schwartz wrote:
> Since 13cb20fc46 ("meson: fix compilation with Visual Studio",
> 2025-01-22) it has not been possible to list build options via `meson
> configure`.
Nit: it _is_ possible to do this in the build directory. What doesn't
work is to do this in the source directory.
> This is due to Meson's static analysis of build options
> failing to handle constant folding, and thinking we set a totally
> invalid default `-std=`.
Interesting.
> This is reported upstream but we anyways need to work with existing
> versions. It turns out there is a simple solution: turn the entire
> default option into a conditional branch, which means Meson sees either
> nothing, or everything.
>
> As a result, Git users can once again see pretty-printed options before
> building.
Nice.
> Reported-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx>
> Bug: https://github.com/mesonbuild/meson/issues/14623
> Signed-off-by: Eli Schwartz <eschwartz@xxxxxxxxxx>
> ---
> meson.build | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index a1476e5b32..43fc3afdf5 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -215,14 +215,12 @@ project('git', 'c',
> capture: true,
> check: true,
> ).stdout().strip() : 'unknown',
> - default_options: [
> - # Git requires C99 with GNU extensions, which of course isn't supported by
> - # MSVC. Funny enough, C99 doesn't work with MSVC either, as it has only
> - # learned to define __STDC_VERSION__ with C11 and later. We thus require
> - # GNU C99 and fall back to C11. Meson only learned to handle the fallback
> - # with version 1.3.0, so on older versions we use GNU C99 unconditionally.
> - 'c_std=' + (meson.version().version_compare('>=1.3.0') ? 'gnu99,c11' : 'gnu99'),
> - ],
> + # Git requires C99 with GNU extensions, which of course isn't supported by
> + # MSVC. Funny enough, C99 doesn't work with MSVC either, as it has only
> + # learned to define __STDC_VERSION__ with C11 and later. We thus require
> + # GNU C99 and fall back to C11. Meson only learned to handle the fallback
> + # with version 1.3.0, so on older versions we use GNU C99 unconditionally.
> + default_options: meson.version().version_compare('>=1.3.0') ? ['c_std=gnu99,c11'] : ['c_std=gnu99'],
> )
Makes sense. It doesn't really make much of a difference for us in which
of the two ways we format this, so let's just stick with what works. We
could of course link to the upstream bug here in the comment, but on the
other hand I don't expect that we'll have to touch these anytime soon
anyway.
So this patch looks good to me, thanks!
Patrick
