Skip to content

Commit f78bb6d

Browse files
committed
Add patch to fix the CI with cg_gcc
1 parent e53f960 commit f78bb6d

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ jobs:
9494
# - run: git -C linux apply ../ci/x86-boot-Use-std-gnu11-to-fix-build-with-GCC-15.patch
9595

9696
# TODO: remove when fixed in the above branch.
97-
- run: git -C linux apply ../ci/0001-Use-inline-always-for-bit_T-functions.patch
97+
- run: git -C linux apply ../ci/patches/0001-Use-inline-always-for-bit_T-functions.patch
98+
99+
# TODO: remove when fixed in the above branch.
100+
- run: git -C linux apply ../ci/patches/0001-Skip-GCC-flag-for-bindgen.patch
98101

99102
# Setup: `busybox`.
100103
- run: |
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 669e0e3d10ce44a257cd53bff6b84aa8a7ee847c Mon Sep 17 00:00:00 2001
2+
From: Antoni Boucher <bouanto@zoho.com>
3+
Date: Tue, 9 Dec 2025 08:13:47 -0500
4+
Subject: [PATCH] Skip GCC flag for bindgen
5+
6+
---
7+
rust/Makefile | 3 ++-
8+
1 file changed, 2 insertions(+), 1 deletion(-)
9+
10+
diff --git a/rust/Makefile b/rust/Makefile
11+
index 5d357dce1..e077f4515 100644
12+
--- a/rust/Makefile
13+
+++ b/rust/Makefile
14+
@@ -383,7 +383,8 @@ bindgen_skip_c_flags := -mno-fp-ret-in-387 -mpreferred-stack-boundary=% \
15+
-fno-inline-functions-called-once -fsanitize=bounds-strict \
16+
-fstrict-flex-arrays=% -fmin-function-alignment=% \
17+
-fzero-init-padding-bits=% -mno-fdpic \
18+
- --param=% --param asan-% -fno-isolate-erroneous-paths-dereference
19+
+ --param=% --param asan-% -fno-isolate-erroneous-paths-dereference \
20+
+ -fdiagnostics-show-context=2
21+
22+
# Derived from `scripts/Makefile.clang`.
23+
BINDGEN_TARGET_x86 := x86_64-linux-gnu
24+
--
25+
2.52.0
26+
File renamed without changes.

0 commit comments

Comments
 (0)