try to fix build with vendored mimalloc and boringssl

Author: zh-jq

.github/workflows/static.yml

@@ -25,7 +25,7 @@ env:
 
 jobs:
   musl-gcc:
-    name: musl-c
+    name: musl-gcc
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -48,8 +48,8 @@ jobs:
           sudo apt-get install capnproto musl-tools
       - name: Cargo build
         run: cargo build --target=x86_64-unknown-linux-musl --no-default-features --features secure-vendored-mimalloc,${{ matrix.feature }},quic,vendored-c-ares
-  musl-gxx:
-    name: musl-g++
+  musl-gxx-libstdcxx:
+    name: musl-g++-libstdc++
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/rust-lang/rust:nightly-alpine
@@ -76,15 +76,15 @@ jobs:
           apk add --no-cache perl nasm
           apk add --no-cache libstdc++-dev clang-libclang
       - name: Cargo build
-        run: cargo $UNSTABLE_OPTIONS build --no-default-features --features secure-vendored-mimalloc,${{ matrix.feature }},quic,vendored-c-ares
+        run: cargo $UNSTABLE_OPTIONS build --no-default-features --features ${{ matrix.feature }},quic,vendored-c-ares
   musl-clang-libcxx:
-    name: musl-clang-libcxx
+    name: musl-clang-libc++
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/rust-lang/rust:nightly-alpine
       env:
         CARGO_TERM_COLOR: always
-        RUSTFLAGS: -C target-feature=+crt-static
+        RUSTFLAGS: -C target-feature=+crt-static -C linker=clang -Clink-arg=-fuse-ld=lld -Clink-arg=-lc++abi
         UNSTABLE_OPTIONS: -Ztarget-applies-to-host -Zhost-config
         CC: clang
         CXX: clang++
@@ -93,6 +93,7 @@ jobs:
     strategy:
       matrix:
         feature:
+          - vendored-boringssl,rustls-ring
           - vendored-aws-lc,rustls-aws-lc
           - vendored-aws-lc-fips,rustls-aws-lc-fips
     steps:
@@ -106,7 +107,7 @@ jobs:
       - name: Install dependencies
         run: |
           apk add --no-cache musl-dev linux-headers libc++-dev libc++-static libunwind-static
-          apk add --no-cache clang capnproto-dev clang-libclang cmake make
+          apk add --no-cache clang lld capnproto-dev clang-libclang cmake make
       - name: Install Go for AWS-LC-FIPS
         if: contains(matrix.feature, 'vendored-aws-lc-fips')
         run: apk add --no-cache go perl nasm

Cargo.lock

@@ -168,8 +168,8 @@ tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"
 quinn = { version = "0.11", default-features = false, features = ["runtime-tokio"] }
 quinn-udp = { version = "0.5.9", default-features = false, features = ["fast-apple-datapath"] }
 #
-openssl = { package = "variant-ssl", version = "0.17.11" }
-openssl-sys = { package = "variant-ssl-sys", version = "0.17.11" }
+openssl = { package = "variant-ssl", version = "0.17.30" }
+openssl-sys = { package = "variant-ssl-sys", version = "0.17.30" }
 openssl-probe = "0.2"
 #
 kanal = { version = "0.1.1", default-features = false }

Cargo.toml

@@ -19,3 +19,4 @@ atomic-waker.workspace = true
 [features]
 default = []
 async-job = []
+mimalloc = ["openssl-sys/mimalloc"]

lib/vey-openssl/Cargo.toml

@@ -65,7 +65,7 @@ vey-build-env.workspace = true
 [features]
 default = ["quic", "rustls-ring"]
 jemalloc = ["dep:vey-jemalloc"]
-mimalloc = ["dep:vey-mimalloc"]
+mimalloc = ["dep:vey-mimalloc", "vey-openssl/mimalloc"]
 vendored-mimalloc = ["mimalloc", "vey-mimalloc?/vendored"]
 secure-vendored-mimalloc = ["mimalloc", "vey-mimalloc?/secure"]
 quic = ["vey-types/quic", "vey-socks/quic", "vey-io-ext/quic", "vey-hickory-client/quic", "dep:quinn", "dep:h3", "dep:h3-quinn"]

vey-bench/Cargo.toml

@@ -36,7 +36,7 @@ vey-build-env.workspace = true
 [features]
 default = []
 jemalloc = ["dep:vey-jemalloc", "vey-daemon/jemalloc"]
-mimalloc = ["dep:vey-mimalloc"]
+mimalloc = ["dep:vey-mimalloc", "openssl-sys/mimalloc"]
 vendored-mimalloc = ["mimalloc", "vey-mimalloc?/vendored"]
 secure-vendored-mimalloc = ["mimalloc", "vey-mimalloc?/secure"]
 vendored-openssl = ["openssl/vendored"]

vey-dcgen/Cargo.toml

@@ -65,7 +65,7 @@ vey-build-env.workspace = true
 [features]
 default = ["quic", "rustls-ring"]
 jemalloc = ["dep:vey-jemalloc", "vey-daemon/jemalloc"]
-mimalloc = ["dep:vey-mimalloc"]
+mimalloc = ["dep:vey-mimalloc", "vey-openssl/mimalloc"]
 vendored-mimalloc = ["mimalloc", "vey-mimalloc?/vendored"]
 secure-vendored-mimalloc = ["mimalloc", "vey-mimalloc?/secure"]
 quic = ["vey-daemon/quic", "vey-yaml/quinn", "vey-types/quinn", "dep:quinn"]

vey-gateway/Cargo.toml

@@ -56,7 +56,7 @@ vey-build-env.workspace = true
 [features]
 default = []
 jemalloc = ["dep:vey-jemalloc", "vey-daemon/jemalloc"]
-mimalloc = ["dep:vey-mimalloc"]
+mimalloc = ["dep:vey-mimalloc", "vey-openssl/mimalloc"]
 vendored-mimalloc = ["mimalloc", "vey-mimalloc?/vendored"]
 secure-vendored-mimalloc = ["mimalloc", "vey-mimalloc?/secure"]
 vendored-openssl = ["openssl/vendored", "openssl-probe"]

vey-keyless/Cargo.toml

@@ -112,7 +112,7 @@ vey-build-env.workspace = true
 [features]
 default = ["python", "c-ares", "quic", "rustls-ring"]
 jemalloc = ["dep:vey-jemalloc", "vey-daemon/jemalloc"]
-mimalloc = ["dep:vey-mimalloc"]
+mimalloc = ["dep:vey-mimalloc", "vey-openssl/mimalloc"]
 vendored-mimalloc = ["mimalloc", "vey-mimalloc?/vendored"]
 secure-vendored-mimalloc = ["mimalloc", "vey-mimalloc?/secure"]
 lua = ["mlua"]