Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

riscv: build: make cfg variables more robust #205

Merged
merged 4 commits into from
May 7, 2024
Merged

riscv: build: make cfg variables more robust #205

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
942a45e
riscv: build: make `cfg` variables more robust
rmsyn May 4, 2024
2afe387
riscv: build: use cfg-check directives in build script
rmsyn May 5, 2024
4dd8a43
riscv-rt: build: use cfg-check directives in build script
rmsyn May 5, 2024
a537aa8
riscv-semihosting: build: use cfg-check directives in build script
rmsyn May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions riscv/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Changed

- Made `asm::wfi`, `fence`, `fence_i` and `sfence` safe (ie, removed `unsafe` from their definitions)
- Made `cfg` variable selection more robust for custom targets

## [v0.11.0] - 2024-01-14

Expand Down
6 changes: 3 additions & 3 deletions riscv/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use std::env;

fn main() {
let target = env::var("TARGET").unwrap();
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();

if target.starts_with("riscv32") {
if target_arch == "riscv32" {
println!("cargo:rustc-cfg=riscv");
println!("cargo:rustc-cfg=riscv32");
} else if target.starts_with("riscv64") {
} else if target_arch == "riscv64" {
println!("cargo:rustc-cfg=riscv");
println!("cargo:rustc-cfg=riscv64");
}
Expand Down
Loading