From f0d0f2f2e9955c5c6db0eab66c72e846fd24b0c3 Mon Sep 17 00:00:00 2001
From: Thomas Kintscher <tkintscher@users.noreply.github.com>
Date: Tue, 21 Dec 2021 04:12:58 +0100
Subject: [PATCH] Append to existing RUSTFLAGS, instead of overwriting. (#1582)

* Append to existing RUSTFLAGS, instead of overwriting.

* Assemble RUSTFLAGS correctly.

Co-authored-by: Thomas Kintscher <thomas@flowciety.de>
---
 sqlx-cli/src/prepare.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sqlx-cli/src/prepare.rs b/sqlx-cli/src/prepare.rs
index 7d760632..f8f4db74 100644
--- a/sqlx-cli/src/prepare.rs
+++ b/sqlx-cli/src/prepare.rs
@@ -115,16 +115,16 @@ hint: This command only works in the manifest directory of a Cargo package."#
             bail!("`cargo clean` failed with status: {}", check_status);
         }
 
+        let mut rustflags = env::var("RUSTFLAGS").unwrap_or_default();
+        rustflags.push_str(&format!(
+            " --cfg __sqlx_recompile_trigger=\"{}\"",
+            SystemTime::UNIX_EPOCH.elapsed()?.as_millis()
+        ));
+
         Command::new(&cargo)
             .arg("check")
             .args(cargo_args)
-            .env(
-                "RUSTFLAGS",
-                format!(
-                    "--cfg __sqlx_recompile_trigger=\"{}\"",
-                    SystemTime::UNIX_EPOCH.elapsed()?.as_millis()
-                ),
-            )
+            .env("RUSTFLAGS", rustflags)
             .env("SQLX_OFFLINE", "false")
             .status()?
     } else {