user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Account for optimization levels other than numbers

Browse source 
The build script currently panics with `opt-level=z` or `opt-level=s`.
Account for this here.
This commit is contained in:
Trevor Gross 2025-01-07 17:30:05 -05:00 • committed by Trevor Gross
parent 76714a5657
commit 2b99475df3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/compiler-builtins/libm/configure.rs
View file

@ -7,7 +7,7 @@ use std::path::PathBuf;
pub struct Config {
pub manifest_dir: PathBuf,
pub out_dir: PathBuf,
pub opt_level: u8,
pub opt_level: String,
pub cargo_features: Vec<String>,
pub target_arch: String,
pub target_env: String,
@ -31,7 +31,7 @@ impl Config {
Self {
manifest_dir: PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()),
out_dir: PathBuf::from(env::var("OUT_DIR").unwrap()),
opt_level: env::var("OPT_LEVEL").unwrap().parse().unwrap(),
opt_level: env::var("OPT_LEVEL").unwrap(),
cargo_features,
target_arch: env::var("CARGO_CFG_TARGET_ARCH").unwrap(),
target_env: env::var("CARGO_CFG_TARGET_ENV").unwrap(),
@ -91,7 +91,7 @@ fn emit_arch_cfg() {
fn emit_optimization_cfg(cfg: &Config) {
println!("cargo:rustc-check-cfg=cfg(optimizations_enabled)");
if cfg.opt_level >= 2 {
if !matches!(cfg.opt_level.as_str(), "0" | "1") {
println!("cargo:rustc-cfg=optimizations_enabled");
}
}