Merge pull request #743 from tgross35/fix-opt-level

Account for optimization levels other than numbers
rust-lang · Jan 7, 2025 · 288a33f · 288a33f
2 parents 280c7b1 + 4e3cc6d
commit 288a33f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.rs b/build.rs
@@ -121,7 +121,7 @@ fn configure_libm(target: &Target) {
     }
 
     println!("cargo:rustc-check-cfg=cfg(optimizations_enabled)");
-    if target.opt_level >= 2 {
+    if !matches!(target.opt_level.as_str(), "0" | "1") {
         println!("cargo:rustc-cfg=optimizations_enabled");
     }
 

diff --git a/configure.rs b/configure.rs
@@ -6,7 +6,7 @@ use std::env;
 #[allow(dead_code)]
 pub struct Target {
     pub triple: String,
-    pub opt_level: u8,
+    pub opt_level: String,
     pub cargo_features: Vec<String>,
     pub os: String,
     pub arch: String,
@@ -32,7 +32,7 @@ impl Target {
         Self {
             triple: env::var("TARGET").unwrap(),
             os: env::var("CARGO_CFG_TARGET_OS").unwrap(),
-            opt_level: env::var("OPT_LEVEL").unwrap().parse().unwrap(),
+            opt_level: env::var("OPT_LEVEL").unwrap(),
             cargo_features,
             arch: env::var("CARGO_CFG_TARGET_ARCH").unwrap(),
             vendor: env::var("CARGO_CFG_TARGET_VENDOR").unwrap(),

diff --git a/libm b/libm
+3 −3		configure.rs
+1 −1		crates/libm-test/src/gen/domain_logspace.rs
+171 −66		crates/libm-test/src/gen/extensive.rs
+1 −1		crates/libm-test/src/lib.rs
+78 −11		crates/libm-test/src/num.rs
+2 −1		crates/libm-test/src/precision.rs
+1 −2		crates/libm-test/tests/z_extensive/run.rs