Merge rust-osdev#45

bors[bot] · 64 · bors[bot] · commit 5f7f7852166d · 2019-08-05T21:14:29.000Z
45: Pass location of kernel's Cargo.toml to bootloader r=phil-opp a=64 As discussed in rust-osdev#44. Co-authored-by: Matt Taylor <mstaveleytaylor@gmail.com>
diff --git a/src/builder.rs b/src/builder.rs
@@ -232,6 +232,7 @@ impl Builder {
             cmd.arg("--target").arg(&bootloader_target);
             cmd.arg("--release");
             cmd.env("KERNEL", kernel_bin_path);
+            cmd.env("KERNEL_MANIFEST", &self.kernel_manifest_path);
             cmd.env_remove("RUSTFLAGS");
             cmd.env("XBUILD_SYSROOT_PATH", target_dir.join("bootloader-sysroot")); // for cargo-xbuild
             cmd
