Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/actions/build-upstream/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,10 @@ runs:
if: steps.native.outputs.build == 'true' && contains(inputs.target, 'musl')
run: |
pnpm --filter=vite-plus build-native --target ${INPUTS_TARGET} -x
# No TARGET_CC: cc-rs would prefer it over cargo-zigbuild's zig cc, and host
# clang compiles C deps (aws-lc-sys) against glibc headers, leaving glibc-only
# symbols such as __isoc23_sscanf that do not exist in musl.
env:
TARGET_CC: clang
TARGET_CFLAGS: ${{ contains(inputs.target, 'aarch64') && '-D_BSD_SOURCE' || '' }}
DEBUG: napi:*
INPUTS_TARGET: ${{ inputs.target }}
Expand Down Expand Up @@ -169,8 +171,10 @@ runs:
shell: bash
run: |
pnpm exec napi build -x --target ${INPUTS_TARGET} --release -p vp_global_cli
# No TARGET_CC: cc-rs would prefer it over cargo-zigbuild's zig cc, and host
# clang compiles C deps (aws-lc-sys) against glibc headers, leaving glibc-only
# symbols such as __isoc23_sscanf that do not exist in musl.
env:
TARGET_CC: clang
TARGET_CFLAGS: ${{ contains(inputs.target, 'aarch64') && '-D_BSD_SOURCE' || '' }}
DEBUG: napi:*
INPUTS_TARGET: ${{ inputs.target }}
Expand Down
32 changes: 31 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ reqwest = { version = "0.13", default-features = false }
rolldown-notify = "10.2.0"
rolldown-notify-debouncer-full = "0.7.5"
rustc-hash = "2.1.1"
rustls = { version = "0.23.45", default-features = false, features = ["ring", "std", "tls12"] }
rustls = { version = "0.23.45", default-features = false, features = ["aws_lc_rs", "std", "tls12"] }
same-file = "1.0.6"
schemars = "1.0.0"
self_cell = "1.2.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/vp_shared/src/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pub fn ensure_tls_provider() {
static INIT: std::sync::OnceLock<()> = std::sync::OnceLock::new();
INIT.get_or_init(|| {
// Err means a provider is already installed, which is fine
let _ = rustls::crypto::ring::default_provider().install_default();
let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
});
}

Expand Down
Loading