Merge pull request #365 from pacak/rc-0.2.47

Release 0.2.47
pacak · Jan 21, 2025 · abd6f20 · abd6f20
2 parents 57a62b6 + 5eed884
commit abd6f20
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 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.46"
+version = "0.2.47"
 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.47] - 2025-01-21
+- don't try to override RUSTFLAGS unless needed - this should keep .config/cargo working (#364)
+
 ## [0.2.46] - 2025-01-15
 - `--silent` flag can be used to suppress some of the user directed informatin
   thanks @tgross35

diff --git a/src/main.rs b/src/main.rs
@@ -140,9 +140,11 @@ fn spawn_cargo(
         cmd.arg("-Ccodegen-units=1");
     }
 
-    // `args` from `cargo rustc -- args` are passed only to the final compiler instance.
-    // `RUSTFLAGS` envvar is useful for passing flags to all compiler instances.
-    cmd.env("RUSTFLAGS", rust_flags.trim_start());
+    if !rust_flags.is_empty() {
+        // `args` from `cargo rustc -- args` are passed only to the final compiler instance.
+        // `RUSTFLAGS` envvar is useful for passing flags to all compiler instances.
+        cmd.env("RUSTFLAGS", rust_flags.trim_start());
+    }
 
     if format.verbosity >= 2 {
         safeprintln!("Running: {cmd:?}");