about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-04-23 06:10:54 +0000
committerbors <bors@rust-lang.org>2021-04-23 06:10:54 +0000
commit08e36d7527c6f65b8f537c4644c762efe09880c5 (patch)
treecee5393a54a418f76aef9dbceefe75c24c95053b
parent74f55996fe4b68e548e8652c025a19db7a24e047 (diff)
parent6c423757dd677c88c38ae32e4ee528a064fd3057 (diff)
downloadrust-08e36d7527c6f65b8f537c4644c762efe09880c5.tar.gz
rust-08e36d7527c6f65b8f537c4644c762efe09880c5.zip
Auto merge of #7124 - Jarcho:lintcheck-windows, r=phansch
Fix lintcheck on windows

changelog: None
-rw-r--r--lintcheck/src/main.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/lintcheck/src/main.rs b/lintcheck/src/main.rs
index bfb0c3b3f74..f6a75595c98 100644
--- a/lintcheck/src/main.rs
+++ b/lintcheck/src/main.rs
@@ -22,9 +22,16 @@ use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
+#[cfg(not(windows))]
 const CLIPPY_DRIVER_PATH: &str = "target/debug/clippy-driver";
+#[cfg(not(windows))]
 const CARGO_CLIPPY_PATH: &str = "target/debug/cargo-clippy";
 
+#[cfg(windows)]
+const CLIPPY_DRIVER_PATH: &str = "target/debug/clippy-driver.exe";
+#[cfg(windows)]
+const CARGO_CLIPPY_PATH: &str = "target/debug/cargo-clippy.exe";
+
 const LINTCHECK_DOWNLOADS: &str = "target/lintcheck/downloads";
 const LINTCHECK_SOURCES: &str = "target/lintcheck/sources";