Also recognize an environment variable

EliahKagan · EliahKagan · commit d76bc6d74e92 · 2024-09-22T09:58:46.000Z
To aid in testing, and possibly as something that should even be
kept in some form, this checks if an `RVV_OFF` environment variable
is set and, if so, behaves as though the `rvv-off` feature is
enabled, whether that feature is actually enabled or not.
diff --git a/zng/cmake.rs b/zng/cmake.rs
@@ -14,7 +14,7 @@ pub fn build_zlib_ng(target: &str, compat: bool) {
             .define("WITH_DFLTCC_INFLATE", "1")
             .cflag("-DDFLTCC_LEVEL_MASK=0x7e");
     }
-    if cfg!(feature = "rvv-off") && target.contains("riscv64") {
+    if target.contains("riscv64") && (cfg!(feature = "rvv-off") || env::var_os("RVV_OFF").is_some()) {
         cmake.define("WITH_RVV", "OFF");
     }
     if target == "i686-pc-windows-msvc" {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ pub fn build_zlib_ng(target: &str, compat: bool) {`
`14`	`14`	`.define("WITH_DFLTCC_INFLATE", "1")`
`15`	`15`	`.cflag("-DDFLTCC_LEVEL_MASK=0x7e");`
`16`	`16`	`}`
`17`		`- if cfg!(feature = "rvv-off") && target.contains("riscv64") {`
	`17`	`+ if target.contains("riscv64") && (cfg!(feature = "rvv-off") \|\| env::var_os("RVV_OFF").is_some()) {`
`18`	`18`	`cmake.define("WITH_RVV", "OFF");`
`19`	`19`	`}`
`20`	`20`	`if target == "i686-pc-windows-msvc" {`