feat(rust): upgrade to 1.75.0-dev

TODO: Update the Rust fork with the changes.

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

bootstrap.yml

@@ -73,9 +73,9 @@ sources:
 
   - name: rust
     subdir: 'bundled'
-    git: 'https://github.com/rust-lang/rust.git'
+    git: 'https://github.com/aero-os/rust.git'
     branch: 'master'
-    commit: '0416b1a6f6d5c42696494e1a3a33580fd3f669d8'
+    commit: 'dee2030a44019048171c03d7ddcb134b945df8c5'
 
   - name: llvm
     subdir: 'bundled'
@@ -386,19 +386,20 @@ tools:
     compile:
       - args: |
             cat << EOF > config.toml
-            changelog-seen = 2
+            change-id = 115898
 
             [llvm]
             download-ci-llvm = false
             targets = "X86"
 
             [build]
-            target = ["x86_64-unknown-aero-system", "x86_64-unknown-linux-gnu"]
+            target = ["x86_64-unknown-aero", "x86_64-unknown-linux-gnu"]
             build-dir = "@THIS_BUILD_DIR@"
             docs = false
 
             [install]
             prefix = "@PREFIX@"
+            sysconfdir = "@PREFIX@/etc"
 
             [rust]
             codegen-tests = false
@@ -407,7 +408,7 @@ tools:
             [target.x86_64-unknown-linux-gnu]
             llvm-config = "@BUILD_ROOT@/tools/host-llvm/bin/llvm-config"
 
-            [target.x86_64-unknown-aero-system]
+            [target.x86_64-unknown-aero]
             llvm-config = "@BUILD_ROOT@/tools/host-llvm/bin/llvm-config"
             EOF
       - args: ['python3', '@THIS_SOURCE_DIR@/x.py', 'build', '--stage', '2', '-j', '@PARALLELISM@']

extra-files/rust/config.toml

@@ -3,10 +3,10 @@ patch-in-config = true
 
 [build]
 rustc = "@BUILD_ROOT@/tools/host-rust/bin/rustc"
-target = "x86_64-unknown-aero-system"
+target = "x86_64-unknown-aero"
 rustflags = ["-C", "link-args=-no-pie"]
 
-[target.x86_64-unknown-aero-system]
+[target.x86_64-unknown-aero]
 linker = "@BUILD_ROOT@/tools/host-gcc/bin/x86_64-aero-gcc"
 
 [patch.crates-io]

patches/rust/0001-fix-bootstrap-build-target-in-x.py-and-bootstrap.patch

@@ -0,0 +1,77 @@
+From 1f0ded570575781c7e8dbd0d60c57a2ec72ec987 Mon Sep 17 00:00:00 2001
+From: Anhad Singh <[email protected]>
+Date: Wed, 18 Oct 2023 19:23:49 +1100
+Subject: [PATCH] fix(bootstrap): build target in x.py and bootstrap
+
+Signed-off-by: Anhad Singh <[email protected]>
+---
+ src/bootstrap/bootstrap.py        | 7 +++++--
+ src/bootstrap/src/core/builder.rs | 6 ++++--
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
+index 1a1125a107f..3f3171a9ddf 100644
+--- a/src/bootstrap/bootstrap.py
++++ b/src/bootstrap/bootstrap.py
+@@ -881,7 +881,7 @@ class RustBuild(object):
+         ... "debug", "bootstrap")
+         True
+         """
+-        return os.path.join(self.build_dir, "bootstrap", "debug", "bootstrap")
++        return os.path.join(self.build_dir, "bootstrap", self.build, "debug", "bootstrap")
+ 
+     def build_bootstrap(self):
+         """Build bootstrap"""
+@@ -903,7 +903,7 @@ class RustBuild(object):
+         build_dir = os.path.join(self.build_dir, "bootstrap")
+         if self.clean and os.path.exists(build_dir):
+             shutil.rmtree(build_dir)
+-        # `CARGO_BUILD_TARGET` breaks bootstrap build.
++        # `CARGO_BUILD_TARGET` and `build.target` breaks bootstrap build.
+         # See also: <https://github.com/rust-lang/rust/issues/70208>.
+         if "CARGO_BUILD_TARGET" in env:
+             del env["CARGO_BUILD_TARGET"]
+@@ -987,6 +987,9 @@ class RustBuild(object):
+         except KeyError:
+             pass
+ 
++        args.append("--target")
++        args.append(self.build)
++
+         return args
+ 
+     def build_triple(self):
+diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
+index 039a87e760d..cbbbce4f515 100644
+--- a/src/bootstrap/src/core/builder.rs
++++ b/src/bootstrap/src/core/builder.rs
+@@ -1587,6 +1587,8 @@ pub fn cargo(
+             self.clear_if_dirty(&out_dir, &self.rustc(compiler));
+         }
+ 
++        let artifact_dir = self.out.join("bootstrap/").join(self.build.build.triple).join("debug/");
++
+         // Customize the compiler we're running. Specify the compiler to cargo
+         // as our shim and then pass it some various options used to configure
+         // how the actual compiler itself is called.
+@@ -1599,7 +1601,7 @@ pub fn cargo(
+             .env("RUSTC_STAGE", stage.to_string())
+             .env("RUSTC_SYSROOT", &sysroot)
+             .env("RUSTC_LIBDIR", &libdir)
+-            .env("RUSTDOC", self.bootstrap_out.join("rustdoc"))
++            .env("RUSTDOC", artifact_dir.join("rustdoc"))
+             .env(
+                 "RUSTDOC_REAL",
+                 if cmd == "doc" || cmd == "rustdoc" || (cmd == "test" && want_rustdoc) {
+@@ -1613,7 +1615,7 @@ pub fn cargo(
+         // Clippy support is a hack and uses the default `cargo-clippy` in path.
+         // Don't override RUSTC so that the `cargo-clippy` in path will be run.
+         if cmd != "clippy" {
+-            cargo.env("RUSTC", self.bootstrap_out.join("rustc"));
++            cargo.env("RUSTC", artifact_dir.join("rustc"));
+         }
+ 
+         // Dealing with rpath here is a little special, so let's go into some
+-- 
+2.42.0
+