Skip to content

Commit 0bab05b

Browse files
finalyardslulf
authored andcommitted
Using 'cargo::' build.rs pattern, norm since cargo 1.77; disabled two instructions in 'host/build.rs' as potentially unnecessary.
1 parent 6ead93d commit 0bab05b

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

benchmarks/nrf-sdc/build.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ fn main() {
3232
.unwrap()
3333
.write_all(linker_data())
3434
.unwrap();
35-
println!("cargo:rustc-link-search={}", out.display());
35+
println!("cargo::rustc-link-search={}", out.display());
3636

3737
// By default, Cargo will re-run a build script whenever
3838
// any file in the project changes. By specifying `memory.x`
3939
// here, we ensure the build script is only re-run when
4040
// `memory.x` is changed.
41-
println!("cargo:rerun-if-changed=memory.x");
41+
println!("cargo::rerun-if-changed=memory.x");
4242

43-
println!("cargo:rustc-link-arg-bins=--nmagic");
44-
println!("cargo:rustc-link-arg-bins=-Tlink.x");
45-
println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
43+
println!("cargo::rustc-link-arg-bins=--nmagic");
44+
println!("cargo::rustc-link-arg-bins=-Tlink.x");
45+
println!("cargo::rustc-link-arg-bins=-Tdefmt.x");
4646
}

examples/apache-nimble/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn main() {
2-
println!("cargo:rustc-link-arg-bins=--nmagic");
3-
println!("cargo:rustc-link-arg-bins=-Tlink.x");
4-
println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
2+
println!("cargo::rustc-link-arg-bins=--nmagic");
3+
println!("cargo::rustc-link-arg-bins=-Tlink.x");
4+
println!("cargo::rustc-link-arg-bins=-Tdefmt.x");
55
}

examples/esp32/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
fn main() {
2-
println!("cargo:rustc-link-arg-bins=-Tlinkall.x");
2+
println!("cargo::rustc-link-arg-bins=-Tlinkall.x");
33
}

examples/nrf-sdc/build.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ fn main() {
3232
.unwrap()
3333
.write_all(linker_data())
3434
.unwrap();
35-
println!("cargo:rustc-link-search={}", out.display());
35+
println!("cargo::rustc-link-search={}", out.display());
3636

3737
// By default, Cargo will re-run a build script whenever
3838
// any file in the project changes. By specifying `memory.x`
3939
// here, we ensure the build script is only re-run when
4040
// `memory.x` is changed.
41-
println!("cargo:rerun-if-changed=memory.x");
41+
println!("cargo::rerun-if-changed=memory.x");
4242

43-
println!("cargo:rustc-link-arg-bins=--nmagic");
44-
println!("cargo:rustc-link-arg-bins=-Tlink.x");
45-
println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
43+
println!("cargo::rustc-link-arg-bins=--nmagic");
44+
println!("cargo::rustc-link-arg-bins=-Tlink.x");
45+
println!("cargo::rustc-link-arg-bins=-Tdefmt.x");
4646
}

examples/rp-pico-2-w/build.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn main() {
2121
.unwrap()
2222
.write_all(include_bytes!("memory.x"))
2323
.unwrap();
24-
println!("cargo:rustc-link-search={}", out.display());
24+
println!("cargo::rustc-link-search={}", out.display());
2525

2626
#[cfg(not(feature = "skip-cyw43-firmware"))]
2727
download_cyw43_firmware();
@@ -30,11 +30,11 @@ fn main() {
3030
// any file in the project changes. By specifying `memory.x`
3131
// here, we ensure the build script is only re-run when
3232
// `memory.x` is changed.
33-
println!("cargo:rerun-if-changed=memory.x");
33+
println!("cargo::rerun-if-changed=memory.x");
3434

35-
println!("cargo:rustc-link-arg-bins=--nmagic");
36-
println!("cargo:rustc-link-arg-bins=-Tlink.x");
37-
println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
35+
println!("cargo::rustc-link-arg-bins=--nmagic");
36+
println!("cargo::rustc-link-arg-bins=-Tlink.x");
37+
println!("cargo::rustc-link-arg-bins=-Tdefmt.x");
3838
}
3939

4040
#[cfg(not(feature = "skip-cyw43-firmware"))]
@@ -49,8 +49,8 @@ fn download_cyw43_firmware() {
4949
"README.md",
5050
];
5151

52-
println!("cargo:rerun-if-changed=build.rs");
53-
println!("cargo:rerun-if-changed={}", download_folder);
52+
println!("cargo::rerun-if-changed=build.rs");
53+
println!("cargo::rerun-if-changed={}", download_folder);
5454
std::fs::create_dir_all(download_folder).expect("Failed to create download directory");
5555

5656
// download each file into the folder "cyw43-firmware"

examples/rp-pico-w/build.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn main() {
2121
.unwrap()
2222
.write_all(include_bytes!("memory.x"))
2323
.unwrap();
24-
println!("cargo:rustc-link-search={}", out.display());
24+
println!("cargo::rustc-link-search={}", out.display());
2525

2626
#[cfg(not(feature = "skip-cyw43-firmware"))]
2727
download_cyw43_firmware();
@@ -30,12 +30,12 @@ fn main() {
3030
// any file in the project changes. By specifying `memory.x`
3131
// here, we ensure the build script is only re-run when
3232
// `memory.x` is changed.
33-
println!("cargo:rerun-if-changed=memory.x");
33+
println!("cargo::rerun-if-changed=memory.x");
3434

35-
println!("cargo:rustc-link-arg-bins=--nmagic");
36-
println!("cargo:rustc-link-arg-bins=-Tlink.x");
37-
println!("cargo:rustc-link-arg-bins=-Tlink-rp.x");
38-
println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
35+
println!("cargo::rustc-link-arg-bins=--nmagic");
36+
println!("cargo::rustc-link-arg-bins=-Tlink.x");
37+
println!("cargo::rustc-link-arg-bins=-Tlink-rp.x");
38+
println!("cargo::rustc-link-arg-bins=-Tdefmt.x");
3939
}
4040

4141
#[cfg(not(feature = "skip-cyw43-firmware"))]
@@ -50,8 +50,8 @@ fn download_cyw43_firmware() {
5050
"README.md",
5151
];
5252

53-
println!("cargo:rerun-if-changed=build.rs");
54-
println!("cargo:rerun-if-changed={}", download_folder);
53+
println!("cargo::rerun-if-changed=build.rs");
54+
println!("cargo::rerun-if-changed={}", download_folder);
5555
std::fs::create_dir_all(download_folder).expect("Failed to create download directory");
5656

5757
// download each file into the folder "cyw43-firmware"

host/build.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ fn main() {
2828
.to_ascii_uppercase()
2929
.replace('-', "_");
3030

31-
// only rebuild if build.rs changed. Otherwise Cargo will rebuild if any
32-
// other file changed.
33-
println!("cargo::rustc-check-cfg=cfg(test)");
34-
println!("cargo:rerun-if-changed=build.rs");
31+
//disabled; potentially unnecessary
32+
// only rebuild if build.rs changed. Otherwise Cargo will rebuild if any other file changed.
33+
//println!("cargo::rustc-check-cfg=cfg(test)");
34+
//println!("cargo::rerun-if-changed=build.rs");
3535

3636
// Check feature usage.
3737
//
@@ -119,7 +119,7 @@ fn main() {
119119

120120
// Rebuild if config envvar changed.
121121
for (name, _) in CONFIGS {
122-
println!("cargo:rerun-if-env-changed={crate_name}_{name}");
122+
println!("cargo::rerun-if-env-changed={crate_name}_{name}");
123123
}
124124

125125
let mut configs = HashMap::new();

0 commit comments

Comments
 (0)