From c0d9272a2f1ba52ec128f325cc4f33bc2a431f3a Mon Sep 17 00:00:00 2001 From: Thomas Kintscher Date: Fri, 10 Dec 2021 14:11:05 +0100 Subject: [PATCH 1/2] Append to existing RUSTFLAGS, instead of overwriting. --- sqlx-cli/src/prepare.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sqlx-cli/src/prepare.rs b/sqlx-cli/src/prepare.rs index 7d7606328a..133c3d96fa 100644 --- a/sqlx-cli/src/prepare.rs +++ b/sqlx-cli/src/prepare.rs @@ -115,16 +115,15 @@ hint: This command only works in the manifest directory of a Cargo package."# bail!("`cargo clean` failed with status: {}", check_status); } + let rustflags = env::var("RUSTFLAGS").unwrap_or_default().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 { From b8c173407995074062af5c2a9f7dd75b4cd02d0d Mon Sep 17 00:00:00 2001 From: Thomas Kintscher Date: Fri, 10 Dec 2021 15:29:48 +0100 Subject: [PATCH 2/2] Assemble RUSTFLAGS correctly. --- sqlx-cli/src/prepare.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sqlx-cli/src/prepare.rs b/sqlx-cli/src/prepare.rs index 133c3d96fa..f8f4db7469 100644 --- a/sqlx-cli/src/prepare.rs +++ b/sqlx-cli/src/prepare.rs @@ -115,7 +115,8 @@ hint: This command only works in the manifest directory of a Cargo package."# bail!("`cargo clean` failed with status: {}", check_status); } - let rustflags = env::var("RUSTFLAGS").unwrap_or_default().push_str(&format!( + let mut rustflags = env::var("RUSTFLAGS").unwrap_or_default(); + rustflags.push_str(&format!( " --cfg __sqlx_recompile_trigger=\"{}\"", SystemTime::UNIX_EPOCH.elapsed()?.as_millis() ));