Repository navigation
Commit 548d181
committed
fix(tmachine): link libstdc++ statically and verify static musl binaries
Replace the library search-order workaround in the musl toolchain with an
explicit request: build-artifacts-binaries sets
CXXSTDLIB=static:-bundle=stdc++ for its musl build, so z3-sys asks for a
static libstdc++ on every build host. CXXSTDLIB applies to every target
and Darwin has no libstdc++, so it cannot go into the shared toolchain
environment. The bundled form, static=stdc++, fails because rustc cannot
find libstdc++.a on its own search path.
Run tasks/scripts/verify-static-binary.sh on the musl CLI, sandbox and
prover, as the release does, so a dynamically linked binary fails the
local build.
Signed-off-by: Evan Lezar <[email protected]>1 parent 902ee65 commit 548d181
2 files changed
Lines changed: 16 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
| 30 | + | |
38 | 31 | | |
39 | 32 | | |
40 | 33 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
| 217 | + | |
217 | 218 | | |
| 219 | + | |
| 220 | + | |
218 | 221 | | |
| 222 | + | |
| 223 | + | |
219 | 224 | | |
220 | 225 | | |
221 | 226 | | |
222 | 227 | | |
223 | 228 | | |
224 | 229 | | |
225 | 230 | | |
226 | | - | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
227 | 235 | | |
228 | 236 | | |
229 | 237 | | |
230 | 238 | | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
231 | 245 | | |
232 | 246 | | |
233 | 247 | | |
| |||
0 commit comments