From edd8fd8c9f8b6ef2a8e5b43ed7ded886249b8166 Mon Sep 17 00:00:00 2001
From: Zeckmathederg <zeckma.tech@gmail.com>
Date: Sun, 28 Jul 2024 02:26:05 -0600
Subject: [PATCH] Rust: Fix a few installation "issues".

---
 introduction/welcome/changelog.xml | 10 +++++++++
 shareddeps/drivers/rust.xml        | 33 ++++++++----------------------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 8fd7abe6c2..bc18e66e4f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -39,6 +39,16 @@
     </listitem>
     -->
 
+    <listitem>
+      <para>July 28th, 2024</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Zeckmathederg] - Rust: Fix a few installation
+          <quote>issues</quote>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>July 27th, 2024</para>
       <itemizedlist>
diff --git a/shareddeps/drivers/rust.xml b/shareddeps/drivers/rust.xml
index c77413343d..85ff2def43 100644
--- a/shareddeps/drivers/rust.xml
+++ b/shareddeps/drivers/rust.xml
@@ -366,7 +366,14 @@ EOF</userinput></screen>
     </para>
 
 <screen role='root'><userinput>python3 x.py install rustc std &amp;&amp;
-python3 x.py install --stage=1 cargo clippy rustfmt</userinput></screen>
+install -vm755 \
+  build/host/stage1-tools/*/*/{cargo{,-clippy,-fmt},clippy-driver,rustfmt} \
+  /opt/rustc-&rust-version;/bin &amp;&amp;
+install -vDm644 \
+  src/tools/cargo/src/etc/_cargo \
+  /opt/rustc-&rust-version;/share/zsh/site-functions/_cargo &amp;&amp;
+install -vm644 src/tools/cargo/src/etc/man/* \
+  /opt/rustc-1.80.0/share/man/man1</userinput></screen>
 
     <para>
       Still as the &root; user, fix the installation of documentations
@@ -430,30 +437,6 @@ ln -sfv /opt/rustc/share/zsh/site-functions/_cargo \
       be larger and take longer.
     </para>
 
-    <!-- https://github.com/alexcrichton/openssl-probe/issues/25 -->
-    <para>
-      <envar>SSL_CERT_DIR=/etc/ssl/certs</envar>: Work around an issue
-      causing test failures with the CA certificate store layout used by
-      <xref linkend='make-ca'/>.
-    </para>
-
-    <para>
-      <parameter>--verbose</parameter>: this switch can sometimes provide more
-      information about a test which fails.
-    </para>
-
-    <para>
-      <parameter>--no-fail-fast</parameter>: this switch ensures that the test suite
-      will not stop at the first error.
-    </para>
-
-    <!-- https://github.com/rust-lang/rust/issues/94147 -->
-    <para>
-      <parameter>--stage=1</parameter>: this switch works around an issue
-      causing some Rustc components unnecessarily rebuilt running
-      <command>python3 x.py install</command>.
-    </para>
-
   </sect2>
 
   <sect2 role="configuration">