From 24a6c91d178e9b00fd5d57e8bec7cbd06d7b86b4 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 25 Jul 2024 09:39:06 -0700 Subject: [PATCH] Trim %extra_targets on RHEL [skip changelog] --- rust.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index f1f3902..3672515 100644 --- a/rust.spec +++ b/rust.spec @@ -35,13 +35,18 @@ ExclusiveArch: %{rust_arches} # NB: wasm32-wasi is being gradually replaced by wasm32-wasip1 # https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html %global wasm_targets wasm32-unknown-unknown wasm32-wasi wasm32-wasip1 -%if 0%{?fedora} || 0%{?rhel} >= 10 +%if 0%{?fedora} %global extra_targets x86_64-unknown-none x86_64-unknown-uefi %endif +%if 0%{?rhel} >= 10 +%global extra_targets x86_64-unknown-none +%endif %endif %ifarch aarch64 +%if 0%{?fedora} %global extra_targets aarch64-unknown-none-softfloat aarch64-unknown-uefi %endif +%endif %global all_targets %{?mingw_targets} %{?wasm_targets} %{?extra_targets} %define target_enabled() %{lua: print(string.find(rpm.expand(" %{all_targets} "), rpm.expand(" %1 "), 1, true) or 0)