admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'es/meson-configure-build-options-fix'

Browse Source 
Build procedure updates.

* es/meson-configure-build-options-fix:
  meson: reformat default options to workaround bug in `meson configure`
This commit is contained in:
Junio C Hamano
2025-05-27 13:59:11 -07:00
parent 80f49f2ae7 cddcee7f64
commit 21b0eb0b6a
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meson.build
View File

@@ -215,14 +215,12 @@ project('git', 'c',
capture: true, capture: true,
check: true, check: true,
).stdout().strip() : 'unknown', ).stdout().strip() : 'unknown',
default_options: [ # Git requires C99 with GNU extensions, which of course isn't supported by
# 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
# 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
# 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
# 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.
# 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'],
'c_std=' + (meson.version().version_compare('>=1.3.0') ? 'gnu99,c11' : 'gnu99'),
],
) )
fs = import('fs') fs = import('fs')