Skip to content

Commit a273eca

Browse files
committed
try to fix build with vendored mimalloc and boringssl
1 parent b08d579 commit a273eca

3 files changed

Lines changed: 20 additions & 17 deletions

File tree

.github/workflows/static.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525

2626
jobs:
2727
musl-gcc:
28-
name: musl-c
28+
name: musl-gcc
2929
runs-on: ubuntu-latest
3030
strategy:
3131
matrix:
@@ -48,8 +48,8 @@ jobs:
4848
sudo apt-get install capnproto musl-tools
4949
- name: Cargo build
5050
run: cargo build --target=x86_64-unknown-linux-musl --no-default-features --features secure-vendored-mimalloc,${{ matrix.feature }},quic,vendored-c-ares
51-
musl-gxx:
52-
name: musl-g++
51+
musl-gxx-libstdcxx:
52+
name: musl-g++-libstdc++
5353
runs-on: ubuntu-latest
5454
container:
5555
image: ghcr.io/rust-lang/rust:nightly-alpine
@@ -76,15 +76,15 @@ jobs:
7676
apk add --no-cache perl nasm
7777
apk add --no-cache libstdc++-dev clang-libclang
7878
- name: Cargo build
79-
run: cargo $UNSTABLE_OPTIONS build --no-default-features --features secure-vendored-mimalloc,${{ matrix.feature }},quic,vendored-c-ares
79+
run: cargo $UNSTABLE_OPTIONS build --no-default-features --features ${{ matrix.feature }},quic,vendored-c-ares
8080
musl-clang-libcxx:
81-
name: musl-clang-libcxx
81+
name: musl-clang-libc++
8282
runs-on: ubuntu-latest
8383
container:
8484
image: ghcr.io/rust-lang/rust:nightly-alpine
8585
env:
8686
CARGO_TERM_COLOR: always
87-
RUSTFLAGS: -C target-feature=+crt-static
87+
RUSTFLAGS: -C target-feature=+crt-static -C linker=clang -Clink-arg=-fuse-ld=lld -Clink-arg=-lc++abi
8888
UNSTABLE_OPTIONS: -Ztarget-applies-to-host -Zhost-config
8989
CC: clang
9090
CXX: clang++
@@ -93,6 +93,7 @@ jobs:
9393
strategy:
9494
matrix:
9595
feature:
96+
- vendored-boringssl,rustls-ring
9697
- vendored-aws-lc,rustls-aws-lc
9798
- vendored-aws-lc-fips,rustls-aws-lc-fips
9899
steps:
@@ -106,7 +107,7 @@ jobs:
106107
- name: Install dependencies
107108
run: |
108109
apk add --no-cache musl-dev linux-headers libc++-dev libc++-static libunwind-static
109-
apk add --no-cache clang capnproto-dev clang-libclang cmake make
110+
apk add --no-cache clang lld capnproto-dev clang-libclang cmake make
110111
- name: Install Go for AWS-LC-FIPS
111112
if: contains(matrix.feature, 'vendored-aws-lc-fips')
112113
run: apk add --no-cache go perl nasm

Cargo.lock

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"
168168
quinn = { version = "0.11", default-features = false, features = ["runtime-tokio"] }
169169
quinn-udp = { version = "0.5.9", default-features = false, features = ["fast-apple-datapath"] }
170170
#
171-
openssl = { package = "variant-ssl", version = "0.17.11" }
172-
openssl-sys = { package = "variant-ssl-sys", version = "0.17.11" }
171+
openssl = { package = "variant-ssl", version = "0.17.30" }
172+
openssl-sys = { package = "variant-ssl-sys", version = "0.17.30" }
173173
openssl-probe = "0.2"
174174
#
175175
kanal = { version = "0.1.1", default-features = false }

0 commit comments

Comments
 (0)