Commit 0701bca
authored
build: tolerate use of _Generic from glibc 2.43 with Clang (#911)
Same fix as git-for-windows#6233 in `git-for-windows/git`, cherry-picked here so the
corresponding `microsoft/git` branch builds again on Ubuntu 26.04. The
`ubuntu:rolling` containers used by `linux-{asan-ubsan,sha256,reftable}`
now ship glibc 2.43, which puts `_Generic` into `<sys/cdefs.h>`; Clang
under `-std=gnu99 -Werror` flags it as a C11 extension.
Picking up Patrick Steinhardt's upstream-bound fix from
https://lore.kernel.org/git/20260505-b4-pks-ci-tolerate-glibc-generic-v1-1-5786386fe512@pks.im/
ahead of its eventual merge (no list movement so far, not yet in
`seen`). The diff conflicts with the `ifndef USE_MIMALLOC` wrap that
this fork inherits from `git-for-windows/git`'s `fe5704a3695c "mimalloc:
offer a build-time option to enable it"`; the resolution preserves that
wrap on the `gcc6`-only branch surviving Patrick's patch. `meson.build`
auto-merged.2 files changed
Lines changed: 10 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
32 | 35 | | |
33 | 36 | | |
34 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
861 | 861 | | |
862 | 862 | | |
863 | 863 | | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
864 | 870 | | |
865 | 871 | | |
866 | 872 | | |
| |||
0 commit comments