summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-09-30 05:58:41 -0400
committerGitHub <noreply@github.com>2018-09-30 05:58:41 -0400
commitc77f8c7975515aaafb680198d158ce03ca605b25 (patch)
treea13e705668b9ee165a11f4ed9b458a5e359000e4
parentc6f9fe0e03d04c9b6d5d57c319a7b91962885361 (diff)
parent1c7f8c61e959426f2a79ef1d73c5034ae923812f (diff)
Auto merge of #1404 - auscompgeek:fix-args-are-cpp, r=emilio
Fix args_are_cpp to look for -x without = Clang doesn't allow `=` between `-x` and the language name.
-rw-r--r--src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib.rs b/src/lib.rs
index dbced45e..80191cec 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -99,7 +99,7 @@ use std::sync::Arc;
fn args_are_cpp(clang_args: &[String]) -> bool {
return clang_args
.windows(2)
- .any(|w| w[0] == "-x=c++" || w[1] == "-x=c++" || w == &["-x", "c++"]);
+ .any(|w| w[0] == "-xc++" || w[1] == "-xc++" || w == &["-x", "c++"]);
}
bitflags! {