From 3ca629c1a75192fd74a6ba5e5a1cd2b0c357b7f6 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 26 Apr 2018 07:54:17 -0700
Subject: [PATCH] Don't classify `clang` as MSVC

---
 src/lib.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index 9f6af4b..e9a8a2a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1864,7 +1864,10 @@ impl Tool {
     fn with_features(path: PathBuf, cuda: bool) -> Tool {
         // Try to detect family of the tool from its name, falling back to Gnu.
         let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
-            if fname.contains("cl") && !fname.contains("cloudabi") && !fname.contains("uclibc") {
+            if fname.contains("cl") &&
+                !fname.contains("cloudabi") &&
+                !fname.contains("uclibc") &&
+                (!fname.contains("clang") || fname.contains("clang-cl")) {
                 ToolFamily::Msvc
             } else if fname.contains("clang") {
                 ToolFamily::Clang