Skip to content

Commit 4fa2109

Browse files
authored
Merge pull request #536 from rust-osdev/fix/nightly-breakage-2026-02-01
build with -Zjson-target-spec
2 parents 62884a3 + 2dcb930 commit 4fa2109

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

build.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ fn build_bios_boot_sector() -> PathBuf {
140140
cmd.arg("--version").arg(BOOTLOADER_VERSION);
141141
}
142142
cmd.arg("--locked");
143-
cmd.arg("--target").arg("i386-code16-boot-sector.json");
143+
cmd.arg("--target")
144+
.arg("i386-code16-boot-sector.json")
145+
.arg("-Zjson-target-spec");
144146
cmd.arg("--profile").arg("stage-1");
145147
cmd.arg("-Zbuild-std=core")
146148
.arg("-Zbuild-std-features=compiler-builtins-mem");
@@ -209,7 +211,9 @@ fn build_bios_stage_2() -> PathBuf {
209211
cmd.arg("--version").arg(BOOTLOADER_VERSION);
210212
}
211213
cmd.arg("--locked");
212-
cmd.arg("--target").arg("i386-code16-stage-2.json");
214+
cmd.arg("--target")
215+
.arg("i386-code16-stage-2.json")
216+
.arg("-Zjson-target-spec");
213217
cmd.arg("--profile").arg("stage-2");
214218
cmd.arg("-Zbuild-std=core")
215219
.arg("-Zbuild-std-features=compiler-builtins-mem");
@@ -272,7 +276,9 @@ fn build_bios_stage_3() -> PathBuf {
272276
cmd.arg("--version").arg(BOOTLOADER_VERSION);
273277
}
274278
cmd.arg("--locked");
275-
cmd.arg("--target").arg("i686-stage-3.json");
279+
cmd.arg("--target")
280+
.arg("i686-stage-3.json")
281+
.arg("-Zjson-target-spec");
276282
cmd.arg("--profile").arg("stage-3");
277283
cmd.arg("-Zbuild-std=core")
278284
.arg("-Zbuild-std-features=compiler-builtins-mem");
@@ -335,7 +341,9 @@ fn build_bios_stage_4() -> PathBuf {
335341
cmd.arg("--version").arg(BOOTLOADER_VERSION);
336342
}
337343
cmd.arg("--locked");
338-
cmd.arg("--target").arg("x86_64-stage-4.json");
344+
cmd.arg("--target")
345+
.arg("x86_64-stage-4.json")
346+
.arg("-Zjson-target-spec");
339347
cmd.arg("--profile").arg("stage-4");
340348
cmd.arg("-Zbuild-std=core")
341349
.arg("-Zbuild-std-features=compiler-builtins-mem");

0 commit comments

Comments
 (0)