From 37ddb50218b7fb1f83ff52602a21fcc65e55de03 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Fri, 20 Sep 2024 13:57:14 -0700 Subject: [PATCH] Don't try rustls on i686-pc-windows-msvc It requires nasm to be installed, and I don't want to hassle with that right now. --- ci/run.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/run.sh b/ci/run.sh index a1911de06..5276c2d9d 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -6,10 +6,15 @@ cargo test --target $TARGET --no-run # First test with no extra protocols enabled. cargo test --target $TARGET --no-run --features static-curl # Then with rustls TLS backend. +# # Note: Cross-compiling rustls on windows doesn't work due to requiring some # NASM build stuff in aws_lc_rs, which may soon be fixed by # https://github.com/aws/aws-lc-rs/pull/528. -if [ "$TARGET" != "x86_64-pc-windows-gnu" ] +# +# Compiling on i686-windows requires nasm to be installed (other platforms +# have pre-compiled object files), which is just slightly too much +# inconvenience for me. +if [ "$TARGET" != "x86_64-pc-windows-gnu" ] && [ "$TARGET" != "i686-pc-windows-msvc" ] then cargo test --target $TARGET --no-run --features rustls,static-curl fi