Skip to content

Commit 34afd28

Browse files
Rust wrapper: build.rs improvements from code review
1 parent a511e45 commit 34afd28

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

wrapper/rust/wolfssl-wolfcrypt/build.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn wolfssl_include_dir() -> Result<Option<String>> {
4646
let include_dir = format!("{}/include", prefix);
4747
let wolfssl_dir = Path::new(&include_dir).join("wolfssl");
4848
if !wolfssl_dir.is_dir() {
49-
eprintln!("cargo:warning=WOLFSSL_PREFIX is set but {} does not exist", wolfssl_dir.display());
49+
println!("cargo:warning=WOLFSSL_PREFIX is set but {} does not exist", wolfssl_dir.display());
5050
return Ok(None);
5151
}
5252
Ok(Some(include_dir))
@@ -167,18 +167,20 @@ fn generate_bindings() -> Result<()> {
167167
// type layouts and evaluates architecture-specific preprocessor guards.
168168
let target = env::var("TARGET").unwrap();
169169
let host = env::var("HOST").unwrap();
170-
if target != host && target.ends_with("-none-elf") {
170+
if target != host {
171171
let clang_target = rust_target_to_clang_target(&target);
172172
builder = builder.clang_arg(format!("--target={}", clang_target));
173173

174-
// For bare-metal targets, add the toolchain C runtime headers
175-
// (newlib's time.h etc.) using -idirafter so they appear after
176-
// clang's own built-in includes. This lets clang's stdatomic.h
177-
// take priority over newlib's incompatible version.
178-
if let Some(sysroot) = bare_metal_sysroot(&clang_target) {
179-
builder = builder
180-
.clang_arg("-ffreestanding")
181-
.clang_arg(format!("-idirafter{}/include", sysroot));
174+
if target.ends_with("-none-elf") {
175+
// For bare-metal targets, add the toolchain C runtime headers
176+
// (newlib's time.h etc.) using -idirafter so they appear after
177+
// clang's own built-in includes. This lets clang's stdatomic.h
178+
// take priority over newlib's incompatible version.
179+
if let Some(sysroot) = bare_metal_sysroot(&clang_target) {
180+
builder = builder
181+
.clang_arg("-ffreestanding")
182+
.clang_arg(format!("-idirafter{}/include", sysroot));
183+
}
182184
}
183185
}
184186

0 commit comments

Comments
 (0)