Merge branch 'rewrite-arch-dirs' into rewrite

Author: katietheqt-old

build.rs

@@ -8,16 +8,18 @@ use std::process::Command;
 
 fn main() {
     // Read environment variables set by cargo
-    let out_dir_path = env::var("OUT_DIR").expect("Missing OUT_DIR environment variable");
-    let out_dir = Path::new(&out_dir_path);
-
     let cargo_path = env::var("CARGO").expect("Missing CARGO environment variable");
     let cargo = Path::new(&cargo_path);
 
     let manifest_dir_path =
         env::var("CARGO_MANIFEST_DIR").expect("Missing CARGO_MANIFEST_DIR environment variable");
     let manifest_dir = Path::new(&manifest_dir_path);
 
+    // Find the root project target dir
+    let current_dir = env::current_dir().expect("Couldn't get current directory");
+    let target_dir_rel = manifest_dir.join("target");
+    let target_dir = current_dir.join(target_dir_rel);
+
     // Find the objcopy binary
     let llvm_tools = LlvmTools::new().expect("LLVM tools not found");
     let objcopy = llvm_tools
@@ -34,7 +36,7 @@ fn main() {
             "dap_load_failed",
         ],
         "../i8086-real_mode.json",
-        &out_dir,
+        &target_dir,
         &objcopy,
         &cargo,
     );
@@ -44,7 +46,7 @@ fn main() {
         Path::new("src/real/stage_2"),
         &["second_stage"],
         "../i8086-real_mode.json",
-        &out_dir,
+        &target_dir,
         &objcopy,
         &cargo,
     );
@@ -54,7 +56,7 @@ fn build_subproject(
     subproject_dir: &Path,
     global_symbols: &[&str],
     target_file_path: &str,
-    root_out_dir: &Path,
+    root_target_dir: &Path,
     objcopy: &Path,
     cargo: &Path,
 ) {
@@ -66,7 +68,8 @@ fn build_subproject(
     let target_file = Path::new(&target_file_path)
         .file_stem()
         .expect("Couldn't get target file stem");
-    let target_dir = root_out_dir.join("target").join(&subproject_name);
+
+    let target_dir = root_target_dir.join(&subproject_name);
 
     // We have to export at least 1 symbol
     assert!(
@@ -83,6 +86,9 @@ fn build_subproject(
     // Build in release mode
     build_cmd.arg("build").arg("--release");
 
+    // Very verbose (build script output only shows if you use `-vv` or it fails anyway)
+    build_cmd.arg("-vv");
+
     // Cross-compile core (cargo-xbuild no longer needed)
     build_cmd.arg("-Zbuild-std=core");