Commit 7843a71
committed
ci: fix fuzz and i686 multiarch jobs for boring 5
Two CI jobs broke after the boring 4 -> 5 upgrade because BoringSSL
is now built by `boring-sys` rather than by `quiche/src/build.rs`,
and a couple of flags we used to set in-tree need to be re-injected
from outside the build.
1. fuzz (nightly): BoringSSL 5.x consolidated the older
`BORINGSSL_UNSAFE_{DETERMINISTIC,FUZZER}_MODE` defines into a
single `FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION` switch.
2. quiche_multiarch (i686-unknown-linux-gnu): BoringSSL's x86
assembly requires SSE2. `boring-sys` does set `-msse2` via
`util/32-bit-toolchain.cmake`, but only when host != target; the
`cross` `i686:edge` image is 32-bit-native, so that branch is
skipped and the build fails with `x86 assembly requires SSE2`.
Add a target-scoped `CFLAGS`/`CXXFLAGS` passthrough in
`Cross.toml` so `-msse2 -mfpmath=sse` reaches BoringSSL's cmake
build regardless.1 parent 66ae999 commit 7843a71
2 files changed
Lines changed: 20 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
72 | | - | |
73 | | - | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
74 | 77 | | |
75 | | - | |
76 | | - | |
| 78 | + | |
| 79 | + | |
77 | 80 | | |
78 | 81 | | |
79 | 82 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
0 commit comments