From 14dde99627119f76fd9970dcd07f883be5bc7101 Mon Sep 17 00:00:00 2001
From: Christophe MASSOLIN <christophe.massolin@gmail.com>
Date: Tue, 5 May 2020 18:15:13 +0200
Subject: Pass cargo.target to rustc

---
 crates/ra_project_model/src/lib.rs         | 18 +++++++++++++-----
 crates/rust-analyzer/src/cli/load_cargo.rs |  2 +-
 crates/rust-analyzer/src/world.rs          |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 731cbd291..8fa895aa6 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -543,7 +543,7 @@ impl ProjectWorkspace {
     }
 }
 
-pub fn get_rustc_cfg_options() -> CfgOptions {
+pub fn get_rustc_cfg_options(target: Option<&String>) -> CfgOptions {
     let mut cfg_options = CfgOptions::default();
 
     // Some nightly-only cfgs, which are required for stdlib
@@ -558,10 +558,18 @@ pub fn get_rustc_cfg_options() -> CfgOptions {
 
     match (|| -> Result<String> {
         // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here.
-        let output = Command::new("rustc")
-            .args(&["--print", "cfg", "-O"])
-            .output()
-            .context("Failed to get output from rustc --print cfg -O")?;
+        let output = if let Some(target) = target {
+            Command::new("rustc")
+                .args(&["--print", "cfg", "-O", "--target", target.as_str()])
+                .output()
+                .context("Failed to get output from rustc --print cfg -O")?
+        } else {
+            Command::new("rustc")
+                .args(&["--print", "cfg", "-O"])
+                .output()
+                .context("Failed to get output from rustc --print cfg -O")?
+        };
+
         if !output.status.success() {
             bail!(
                 "rustc --print cfg -O exited with exit code ({})",
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index d0a71120a..023ced6cf 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -149,7 +149,7 @@ pub(crate) fn load(
 
     // FIXME: cfg options?
     let default_cfg_options = {
-        let mut opts = get_rustc_cfg_options();
+        let mut opts = get_rustc_cfg_options(None);
         opts.insert_atom("test".into());
         opts.insert_atom("debug_assertion".into());
         opts
diff --git a/crates/rust-analyzer/src/world.rs b/crates/rust-analyzer/src/world.rs
index 34941931b..16020648d 100644
--- a/crates/rust-analyzer/src/world.rs
+++ b/crates/rust-analyzer/src/world.rs
@@ -131,7 +131,7 @@ impl WorldState {
 
         // FIXME: Read default cfgs from config
         let default_cfg_options = {
-            let mut opts = get_rustc_cfg_options();
+            let mut opts = get_rustc_cfg_options(config.cargo.target.as_ref());
             opts.insert_atom("test".into());
             opts.insert_atom("debug_assertion".into());
             opts
-- 
cgit v1.2.3