Skip to content

Actual no_std and add -ffreestanding when building for no OS #1

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

Merged
nazar-pc merged 1 commit into from
Apr 21, 2023
Merged

Actual no_std and add -ffreestanding when building for no OS #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions bindings/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ links = "blst"
# Binary can be executed on systems similar to the host.
default = ["std"]
# When compiled without this feature library is `no_std` compatible
std = []
std = ["dep:threadpool"]
# Compile in portable mode, without ISA extensions.
# Binary can be executed on all systems.
portable = []
Expand All @@ -48,7 +48,7 @@ glob = "0.3"
zeroize = { version = "^1.1", features = ["zeroize_derive"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
threadpool = "^1.8.1"
threadpool = { version = "^1.8.1", optional = true }

[dev-dependencies]
rand = "0.7"
Expand Down
3 changes: 2 additions & 1 deletion bindings/rust/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ fn assembly(file_vec: &mut Vec<PathBuf>, base_dir: &Path, _arch: &String) {
fn main() {
// account for cross-compilation [by examining environment variable]
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();

if target_arch.eq("wasm32") {
println!("cargo:rustc-cfg=feature=\"no-threads\"");
Expand Down Expand Up @@ -131,7 +132,7 @@ fn main() {
.flag_if_supported("-fno-builtin")
.flag_if_supported("-Wno-unused-function")
.flag_if_supported("-Wno-unused-command-line-argument");
if target_arch.eq("wasm32") {
if target_arch.eq("wasm32") || target_os.eq("none") {
cc.flag_if_supported("-ffreestanding");
}
if !cfg!(debug_assertions) {
Expand Down