userland: build userland using our custom rust toolchain

Author: 48cf

aero.py

@@ -193,13 +193,13 @@ def extract_artifacts(stdout):
     return result
 
 
-def build_cargo_workspace(cwd, command, args):
-    code, _, _ = run_command(['cargo', command, *args], cwd=cwd)
+def build_cargo_workspace(cwd, command, args, cargo='cargo'):
+    code, _, _ = run_command([cargo, command, *args], cwd=cwd)
 
     if code != 0:
         return None
 
-    _, stdout, _ = run_command(['cargo', command, *args, '--message-format=json'],
+    _, stdout, _ = run_command([cargo, command, *args, '--message-format=json'],
                                stdout=subprocess.PIPE,
                                stderr=subprocess.DEVNULL,
                                cwd=cwd)
@@ -279,10 +279,13 @@ def build_userland(args):
     if args.check:
         command = 'check'
 
+    cargo = '../sysroot/tools/host-cargo/bin/cargo'
+    cmd_args += ['--target', 'x86_64-unknown-aero-system']
+
     if args.test:
-        return build_cargo_workspace('userland', 'build', ['--package', 'utest', *cmd_args])
+        return build_cargo_workspace('userland', 'build', ['--package', 'utest', *cmd_args], cargo)
     else:
-        return build_cargo_workspace('userland', command, cmd_args)
+        return build_cargo_workspace('userland', command, cmd_args, cargo)
 
     # TODO: Userland check
     # elif args.check:

userland/.cargo/config.toml

@@ -1,6 +1,19 @@
-[unstable]
-build-std = ["core", "compiler_builtins", "alloc"]
-build-std-features = ["compiler-builtins-mem"]
-
 [build]
-target = "./.cargo/x86_64-unknown-none.json"
+rustc = "/home/czapek/Development/aero/sysroot/tools/host-rust/bin/rustc"
+target = "x86_64-unknown-aero-system"
+rustflags = ["-C", "link-args=-no-pie", "-lc"]
+
+[target.x86_64-unknown-aero-system]
+linker = "/home/czapek/Development/aero/sysroot/tools/host-gcc/bin/x86_64-aero-gcc"
+
+[patch.crates-io]
+libc = { path = "/home/czapek/Development/aero/bundled/rust-libc" }
+num_cpus = { path = "/home/czapek/Development/aero/bundled/rust-num-cpus" }
+users = { path = "/home/czapek/Development/aero/bundled/rust-users" }
+
+# [unstable]
+# build-std = ["core", "compiler_builtins", "alloc"]
+# build-std-features = ["compiler-builtins-mem"]
+
+# [build]
+# target = "./.cargo/x86_64-unknown-none.json"

userland/aero_shell/Cargo.toml

@@ -6,4 +6,3 @@ edition = "2021"
 
 [dependencies]
 aero_syscall = { path = "../../src/aero_syscall" }
-std = { path = "../aero_std" }

userland/init/Cargo.toml

@@ -6,4 +6,3 @@ edition = "2021"
 
 [dependencies]
 aero_syscall = { path = "../../src/aero_syscall" }
-std = { path = "../aero_std" }

userland/utest/Cargo.toml

@@ -5,6 +5,5 @@ edition = "2021"
 authors = ["Anhad Singh <[email protected]>"]
 
 [dependencies]
-std = { path = "../aero_std" }
 aero_syscall = { path = "../../src/aero_syscall" }
 utest-proc = { path = "../utest-proc" }