Merge pull request #182 from yusdacra/fix/dependency-detection

fix: also check cfg gated target field for bootloader dependency

Author: phil-opp

Diff for: build.rs

@@ -243,6 +243,13 @@ mod binary {
                 if manifest
                     .get("dependencies")
                     .and_then(|d| d.get("bootloader"))
+                    .or_else(|| {
+                        manifest
+                            .get("target")
+                            .and_then(|table| table.get(r#"cfg(target_arch = "x86_64")"#))
+                            .and_then(|table| table.get("dependencies"))
+                            .and_then(|table| table.get("bootloader"))
+                    })
                     .is_some()
                 {
                     // it seems to be the correct Cargo.toml

Diff for: tests/test_kernels/map_phys_mem/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Philipp Oppermann <[email protected]>"]
 edition = "2018"
 
-[dependencies]
+[target.'cfg(target_arch = "x86_64")'.dependencies]
 bootloader = { path = "../../.." }
 x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
 uart_16550 = "0.2.10"