From 4dc8fc34493c48234f0c815eca4f2d266b628225 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 4 Nov 2021 14:10:55 +0100 Subject: [PATCH] Revert "rustc-1.56.1-0: Update bootstrap paths" This reverts commit c22c46ad18e825ac66351e9b1895c8340376752d. [Properly bootstrapping Rust is too much work.][1] [1]: https://github.molgen.mpg.de/mariux64/pkg-scripts/issues/171 --- rustc-1.56.1-0.build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rustc-1.56.1-0.build.sh b/rustc-1.56.1-0.build.sh index 0a6cf03..4743359 100755 --- a/rustc-1.56.1-0.build.sh +++ b/rustc-1.56.1-0.build.sh @@ -50,9 +50,9 @@ targets = "X86" experimental-targets = "" [build] -cargo = "/pkg/rustc-1.52.1-0/bin/cargo" -rustc = "/pkg/rustc-1.52.1-0/bin/rustc" -rustfmt = "/pkg/rustc-1.52.1-0/bin/rustfmt" +cargo = "/usr/local/package/bin/cargo" +rustc = "/usr/local/package/bin/rustc" +rustfmt = "/usr/local/package/bin/rustfmt" # omit HTML docs to save time and space (comment this to build them) docs = false @@ -81,7 +81,7 @@ backtrace-on-ice = false EOF -export PATH=/pkg/rustc-1.52.1-0/bin:$PATH LD_LIBRARY_PATH=/pkg/rustc-1.52.1-0/lib:$LD_LIBRARY_PATH RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" && +export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" && python3 ./x.py build --exclude src/tools/miri python3 ./x.py install