Trying to fix

Author: katietheqt-old

.cargo/config

@@ -1,2 +1,2 @@
 [build]
-target = "src/real/x86_64-real_mode.json"
+target = "x86_64-real_mode.json"

build.rs

@@ -10,25 +10,25 @@ fn main() {
         .tool(&exe("llvm-objcopy"))
         .expect("llvm-objcopy not found");
 
-    build_subproject(
+    /*build_subproject(
         Path::new("src/real/bootsector"),
         &[
             "_start",
             "real_mode_println",
             "no_int13h_extensions",
             "dap_load_failed",
         ],
-        "real/x86_64-real_mode.json",
+        "x86_64-bootsector.json",
         &out_dir,
         &objcopy,
-    );
+    );*/
 
     build_subproject(
         Path::new("src/real/stage_2"),
         &[
             "second_stage",
         ],
-        "real/x86_64-real_mode.json",
+        "x86_64-stage_2.json",
         &out_dir,
         &objcopy,
     );
@@ -43,7 +43,6 @@ fn build_subproject(
     objcopy: &Path,
 ) {
     let dir_name = dir.file_name().unwrap().to_str().unwrap();
-    let manifest_path = dir.join("Cargo.toml");
     let out_path = Path::new(&out_dir);
     assert!(
         global_symbols.len() > 0,
@@ -52,14 +51,15 @@ fn build_subproject(
 
     // build
     let mut cmd = Command::new("cargo");
-    cmd.arg("xbuild").arg("--release");
-    
+    cmd.current_dir(&dir);
+
+    cmd.arg("xbuild").arg("--release");    
     cmd.arg("--verbose");
 
-    cmd.arg(format!("--manifest-path={}", manifest_path.display()));
     cmd.arg(format!(
         "--target={}",
-        dir.join("..").join("..").join(target).display()
+        //dir.join(target).display()
+        target
     ));
     cmd.arg("-Z").arg("unstable-options");
     cmd.arg("--out-dir").arg(&out_dir);

src/real/x86_64-real_mode.json renamed to src/real/bootsector/x86_64-bootsector.json

@@ -6,7 +6,7 @@
 
 use shared::linker_symbol;
 use shared::println;
-use v86::gdt::{Descriptor, GlobalDescriptorTable, TaskStateSegment};
+use shared::structures::gdt::{Descriptor, GlobalDescriptorTable, TaskStateSegment};
 
 use lazy_static::lazy_static;
 

src/real/stage_2/src/lib.rs

@@ -0,0 +1,26 @@
+{
+	"arch": "x86",
+	"cpu": "i386",
+	"data-layout": "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128",
+	"dynamic-linking": false,
+	"executables": true,
+	"linker-flavor": "ld.lld",
+	"linker": "rust-lld",
+	"llvm-target": "i386-unknown-none-code16",
+	"max-atomic-width": 64,
+	"position-independent-executables": false,
+	"disable-redzone": true,
+	"target-c-int-width": "32",
+	"target-pointer-width": "32",
+	"target-endian": "little",
+	"panic-strategy": "abort",
+	"os": "none",
+	"vendor": "unknown",
+	"relocation_model": "static",
+	"eliminate_frame_pointer": true,
+	"pre-link-args": {
+		"ld.lld": [
+			"--script=real/linker.ld"
+		]
+	}
+}

src/real/stage_2/x86_64-stage_2.json

@@ -0,0 +1,26 @@
+{
+	"arch": "x86",
+	"cpu": "i386",
+	"data-layout": "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128",
+	"dynamic-linking": false,
+	"executables": true,
+	"linker-flavor": "ld.lld",
+	"linker": "rust-lld",
+	"llvm-target": "i386-unknown-none-code16",
+	"max-atomic-width": 64,
+	"position-independent-executables": false,
+	"disable-redzone": true,
+	"target-c-int-width": "32",
+	"target-pointer-width": "32",
+	"target-endian": "little",
+	"panic-strategy": "abort",
+	"os": "none",
+	"vendor": "unknown",
+	"relocation_model": "static",
+	"eliminate_frame_pointer": true,
+	"pre-link-args": {
+		"ld.lld": [
+			"--script=real/linker.ld"
+		]
+	}
+}