Merge pull request #270 from pacak/rc-0.2.34

Release 0.2.34
pacak · Apr 25, 2024 · f2b808c · f2b808c
2 parents 02d4e7f + 2f4e44c
commit f2b808c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-show-asm"
-version = "0.2.33"
+version = "0.2.34"
 edition = "2021"
 description = "A cargo subcommand that displays the generated assembly of Rust source code."
 categories = ["development-tools::cargo-plugins", "development-tools::debugging"]

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [0.2.34] - 2024-04-25
+- don't force debuginfo in llvm, fixes #269
+
 ## [0.2.33] - 2024-04-24
 - Experimental support for disassembly, `cargo-show-asm` needs to be compiled with "disasm"
   feature.

diff --git a/src/main.rs b/src/main.rs
@@ -111,13 +111,13 @@ fn spawn_cargo(
         .args(target_cpu.iter().map(|cpu| format!("-Ctarget-cpu={cpu}")));
 
     {
-        if syntax.emit() == Some("asm") {
+        // None corresponds to disasm
+        if [Some("asm"), None].contains(&syntax.emit()) {
             // Debug info is needed to detect function boundaries in asm (Windows/Mac), and to map asm/wasm
             // output to rust source.
             cmd.arg("-Cdebuginfo=2");
         }
     }
-    cmd.arg("-Cdebuginfo=2");
 
     // current rust does not emit info about generated byproducts, new one will :)
     if force_single_cgu {