chore: fixing build error 6 annotations

Author: oxyzenQ

.github/workflows/release.yml

@@ -284,7 +284,8 @@ jobs:
               throw "Expected embedded build id '$build' in binary"
             }
           } else {
-            $out = & $bin -i
+            $outLines = & $bin -i
+            $out = $outLines -join "`n"
             $out
             if ($out -notmatch [regex]::Escape("build: $build")) {
               throw "Expected build id 'build: $build' in cosmostrix -i output"

Cargo.toml

@@ -6,6 +6,7 @@ rust-version = "1.81"
 authors = ["rezk_nightky"]
 description = "A cosmic take on the classic Matrix rain for the terminal"
 license = "MIT"
+build = "build.rs"
 
 [dependencies]
 clap = { version = "4.5.23", features = ["derive"] }

build.rs

@@ -0,0 +1,44 @@
+fn main() {
+    println!("cargo:rerun-if-env-changed=COSMOSTRIX_BUILD");
+    println!("cargo:rerun-if-env-changed=RUSTFLAGS");
+    println!("cargo:rerun-if-env-changed=CARGO_ENCODED_RUSTFLAGS");
+
+    let build_id = if let Ok(v) = std::env::var("COSMOSTRIX_BUILD") {
+        if !v.is_empty() {
+            v
+        } else {
+            infer_build_id()
+        }
+    } else {
+        infer_build_id()
+    };
+
+    println!("cargo:rustc-env=COSMOSTRIX_BUILD={}", build_id);
+}
+
+fn infer_build_id() -> String {
+    let os_raw = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_else(|_| "unknown".to_string());
+    let os = match os_raw.as_str() {
+        "macos" => "darwin",
+        other => other,
+    };
+
+    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_else(|_| "unknown".to_string());
+    let features = std::env::var("CARGO_CFG_TARGET_FEATURE").unwrap_or_default();
+
+    let variant = if arch == "x86_64" {
+        if features.contains("avx512f") {
+            "v4"
+        } else if features.contains("avx2") {
+            "v3"
+        } else if features.contains("sse4.2") || features.contains("sse4_2") {
+            "v2"
+        } else {
+            "v1"
+        }
+    } else {
+        "native"
+    };
+
+    format!("{os}-{arch}-{variant}")
+}

src/main.rs

@@ -51,30 +51,8 @@ const HELP_TEMPLATE_COLOR: &str = "\
 
 {all-args}{after-help}";
 
-fn build_info() -> String {
-    if let Some(v) = option_env!("COSMOSTRIX_BUILD") {
-        return v.to_string();
-    }
-
-    let os = match std::env::consts::OS {
-        "macos" => "darwin",
-        other => other,
-    };
-    let arch = std::env::consts::ARCH;
-
-    let variant = if cfg!(all(target_arch = "x86_64", target_feature = "avx512f")) {
-        "v4"
-    } else if cfg!(all(target_arch = "x86_64", target_feature = "avx2")) {
-        "v3"
-    } else if cfg!(all(target_arch = "x86_64", target_feature = "sse4.2")) {
-        "v2"
-    } else if cfg!(target_arch = "x86_64") {
-        "v1"
-    } else {
-        "native"
-    };
-
-    format!("{os}-{arch}-{variant}")
+fn build_info() -> &'static str {
+    env!("COSMOSTRIX_BUILD")
 }
 
 fn clap_styles() -> ClapStyles {