Skip to content

Commit 9eb0511

Browse files
committed
- x32 rust-std is not needed to bootstrap
1 parent 8f17664 commit 9eb0511

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

rust.spec

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_ru
4242
# Source1-md5: 62b0974a4bad5aeabd50c7a7fa74518c
4343
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
4444
# Source2-md5: 758d55172c8dddb1ec71913b5f532bb2
45-
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-std-%{bootstrap_rust}-x86_64-unknown-linux-gnux32.tar.xz
46-
# Source3-md5: 4b07c6922a0965791cf8eb28fee9e89d
47-
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
48-
# Source4-md5: 3a9d54ab96f96664b2f6077cccb4e70b
45+
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
46+
# Source3-md5: 3a9d54ab96f96664b2f6077cccb4e70b
4947
Patch0: %{name}-no-miri.patch
5048
Patch1: %{name}-x32.patch
5149
URL: https://www.rust-lang.org/
@@ -266,14 +264,8 @@ tar xf %{SOURCE1}
266264
%ifarch %{ix86}
267265
tar xf %{SOURCE2}
268266
%endif
269-
%ifarch x32
270-
cd %{bootstrap_root}
271-
tar xf %{SOURCE3}
272-
%{__mv} rust-std-%{bootstrap_rust}-%{rust_triple} rust-std-%{rust_triple}
273-
cd ..
274-
%endif
275267
%ifarch aarch64
276-
tar xf %{SOURCE4}
268+
tar xf %{SOURCE3}
277269
%endif
278270
%{__mv} %{bootstrap_root} %{bootstrap_root}-root
279271
%{bootstrap_root}-root/install.sh \
@@ -282,12 +274,6 @@ tar xf %{SOURCE4}
282274
--disable-ldconfig
283275
test -f %{local_rust_root}/bin/cargo
284276
test -f %{local_rust_root}/bin/rustc
285-
%ifarch x32
286-
%{bootstrap_root}-root/rust-std-%{rust_triple}/install.sh \
287-
--components=rust-std-%{rust_triple} \
288-
--prefix=%{local_rust_root} \
289-
--disable-ldconfig
290-
%endif
291277
%endif
292278

293279
# unbundle

0 commit comments

Comments
 (0)