Commit 2d9803c
authored
Update ldk-node and bpi (#42)
* Update ldk-node and bpi
* Unblock aws-lc-sys cross-compile in CI
The new bpi rev pulled reqwest 0.13, whose `rustls` feature forces
aws-lc-rs as the rustls crypto provider via cargo feature unification.
aws-lc-sys then has to cross-compile its bundled C, which conflicts with
the napi-rs docker images on the two gnu Linux targets:
- x86_64-unknown-linux-gnu: aws-lc-sys passes `-fuse-ld=lld` to the
compiler unconditionally. The image's custom `x86_64-unknown-linux-gnu-gcc`
does not recognize the flag, but the image's clang (already CC=clang)
does once lld is installed.
- aarch64-unknown-linux-gnu: the image's custom cross toolchain at
/usr/aarch64-unknown-linux-gnu has a sysroot missing stdatomic.h.
Debian's gcc-aarch64-linux-gnu plus libc6-dev-arm64-cross provides
the C11 atomics header.
The catch is that aws-lc-sys reads TARGET_CC ahead of CC_<target> and
CC. The image pre-sets TARGET_CC to its custom gcc, so any CC_<target>
exports were ignored until we unset TARGET_CC (and TARGET_CXX,
TARGET_AR) first. Same story for CFLAGS on aarch64, which the image
pre-sets to the broken sysroot.
The alternative was patching bpi to use reqwest's `rustls-no-provider`
plus an explicit ring provider, which would have required a runtime
CryptoProvider::install_default() call and another upstream fork bump.
Keeping rustls's default provider was preferred since the CI fix is
self-contained.
Musl targets were not failing in the latest run. If they break later
the same TARGET_CC unset trick should apply.1 parent 78a326f commit 2d9803c
2 files changed
Lines changed: 23 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
74 | 84 | | |
75 | 85 | | |
76 | 86 | | |
| |||
94 | 104 | | |
95 | 105 | | |
96 | 106 | | |
97 | | - | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
98 | 118 | | |
99 | 119 | | |
100 | 120 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
0 commit comments