From 170b79df1d3a2a664ab6f7b1ccba331c8db87c44 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 8 Jan 2024 12:47:05 -0800 Subject: [PATCH] Reduce rustc's own optimization on i686 Resolves: RHEL-12964 --- rust.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rust.spec b/rust.spec index 0cbbe5b..af52df5 100644 --- a/rust.spec +++ b/rust.spec @@ -656,11 +656,13 @@ end} %{export_rust_env} %ifarch %{arm} %{ix86} -# full debuginfo is exhausting memory; just do libstd for now +# full debuginfo and compiler opts are exhausting memory; just do libstd for now # https://github.com/rust-lang/rust/issues/45854 %define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2 +%define enable_rust_opts --set rust.codegen-units-std=1 %else %define enable_debuginfo --debuginfo-level=2 +%define enable_rust_opts --set rust.codegen-units=1 --set rust.lto=thin %endif # Some builders have relatively little memory for their CPU count. @@ -727,8 +729,7 @@ test -r "%{profiler}" --disable-llvm-static-stdcpp \ --disable-rpath \ %{enable_debuginfo} \ - --set rust.codegen-units=1 \ - --set rust.lto=thin \ + %{enable_rust_opts} \ --set build.build-stage=2 \ --set build.doc-stage=2 \ --set build.install-stage=2 \