Fix cc sysroot path and target for morello linux in bootstrap

CyberHive · Jan 15, 2024 · 381c48d · 381c48d
1 parent 5d4dced
commit 381c48d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -1752,7 +1752,7 @@ impl<'a> Builder<'a> {
             rustflags.arg("-Clink-args=-march=morello+c64");
             rustflags.arg("-Clink-args=-mabi=purecap");
             let sysroot = match home_dir() {
-                Some(path) => path.as_path().join("cheri").join("output").join("musl-bin"),
+                Some(path) => path.as_path().join("morello").join("musl"),
                 None => Path::new("").to_path_buf(),
             };
             let sysroot = sysroot.into_os_string().into_string().unwrap();

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -1088,8 +1088,9 @@ impl Build {
             base.push(format!("--sysroot={}", sysroot));
         }
         if &*target.triple == "morello-unknown-linux-purecap" {
+            base.push("--target=aarch64-unknown-linux-musl_purecap".into());
             let sysroot = match home_dir() {
-                Some(path) => path.as_path().join("cheri").join("output").join("musl-bin"),
+                Some(path) => path.as_path().join("morello").join("musl"),
                 None => Path::new("").to_path_buf(),
             };
             let sysroot = sysroot.into_os_string().into_string().unwrap();

diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
@@ -1039,7 +1039,7 @@ impl Step for TestHelpers {
             }
             if self.target == "morello-unknown-linux-purecap" {
                 let sysroot = match home_dir() {
-                    Some(path) => path.as_path().join("cheri").join("output").join("musl-bin"),
+                    Some(path) => path.as_path().join("morello").join("musl"),
                     None => Path::new("").to_path_buf(),
                 };
                 let sysroot = sysroot.into_os_string().into_string().unwrap();