From e420cd750a81fbaa4080e9413fcd79ad895adbf1 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Tue, 28 Jan 2025 01:21:55 +0900 Subject: [PATCH 1/3] Fix build error on Android --- .github/workflows/build.yml | 1 + Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34e50985..204da807 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,6 +64,7 @@ jobs: strategy: matrix: target: [ + aarch64-linux-android, x86_64-unknown-fuchsia, x86_64-unknown-redox, x86_64-fortanix-unknown-sgx, diff --git a/Cargo.toml b/Cargo.toml index 9d130e32..60ad65da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ compiler_builtins = { version = "0.1", optional = true } core = { version = "1.0", optional = true, package = "rustc-std-workspace-core" } # linux_android / linux_android_with_fallback -[target.'cfg(all(any(target_os = "linux", target_os = "android"), not(any(target_env = "", getrandom_backend = "custom"))))'.dependencies] +[target.'cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom"))))'.dependencies] libc = { version = "0.2.154", default-features = false } # apple-other From 6c583b869813022caa3124201d8e162e746fc273 Mon Sep 17 00:00:00 2001 From: Artyom Pavlov Date: Mon, 27 Jan 2025 20:02:53 +0300 Subject: [PATCH 2/3] Tweak cfg --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 60ad65da..f2785eb8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ compiler_builtins = { version = "0.1", optional = true } core = { version = "1.0", optional = true, package = "rustc-std-workspace-core" } # linux_android / linux_android_with_fallback -[target.'cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom"))))'.dependencies] +[target.'cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))'.dependencies] libc = { version = "0.2.154", default-features = false } # apple-other From 272d10b2340d9f58775ff5b41531b84bb347b0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 27 Jan 2025 20:25:25 +0300 Subject: [PATCH 3/3] Add RUSTDOCFLAGS to fix doctests --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f28ef779..4ba01e80 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,12 +55,15 @@ jobs: - run: cargo test --target=${{ matrix.target }} --features=std - env: RUSTFLAGS: -Dwarnings --cfg getrandom_backend="linux_getrandom" + RUSTDOCFLAGS: -Dwarnings --cfg getrandom_backend="linux_getrandom" run: cargo test --target=${{ matrix.target }} --features=std - env: RUSTFLAGS: -Dwarnings --cfg getrandom_test_linux_fallback + RUSTDOCFLAGS: -Dwarnings --cfg getrandom_test_linux_fallback run: cargo test --features=std - env: RUSTFLAGS: -Dwarnings --cfg getrandom_backend="rdrand" + RUSTDOCFLAGS: -Dwarnings --cfg getrandom_backend="rdrand" run: cargo test --features=std ios: