Pass through clang color diagnostics

mozilla · Aug 21, 2019 · a7611fd · a7611fd
1 parent bf41588
commit a7611fd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/compiler/clang.rs b/src/compiler/clang.rs
@@ -86,6 +86,7 @@ counted_array!(pub static ARGS: [ArgInfo<gcc::ArgData>; _] = [
     take_arg!("--target", OsString, Separated, PassThrough),
     take_arg!("-Xclang", OsString, Separated, XClang),
     take_arg!("-add-plugin", OsString, Separated, PassThrough),
+    flag!("-fcolor-diagnostics", PassThroughFlag),
     flag!("-fcxx-modules", TooHardFlag),
     take_arg!("-fdebug-compilation-dir", OsString, Separated, PassThrough),
     flag!("-fmodules", TooHardFlag),

diff --git a/src/compiler/gcc.rs b/src/compiler/gcc.rs
@@ -76,6 +76,9 @@ impl CCompilerImpl for GCC {
 ArgData!{ pub
     TooHardFlag,
     TooHard(OsString),
+    // Should only be necessary for -Xclang flags - unknown flags not hidden behind
+    // that are assumed to not affect compilation
+    PassThroughFlag,
     PassThrough(OsString),
     PassThroughPath(PathBuf),
     PreprocessorArgumentFlag,
@@ -249,6 +252,7 @@ where
             Some(PreprocessorArgumentFlag) |
             Some(PreprocessorArgument(_)) |
             Some(PreprocessorArgumentPath(_)) |
+            Some(PassThroughFlag) |
             Some(PassThrough(_)) |
             Some(PassThroughPath(_)) => {}
             Some(Language(lang)) => {
@@ -279,6 +283,7 @@ where
             Some(ProfileGenerate) |
             Some(TestCoverage) |
             Some(Coverage) |
+            Some(PassThroughFlag) |
             Some(PassThrough(_)) |
             Some(PassThroughPath(_)) => &mut common_args,
             Some(ExtraHashFile(path)) => {
@@ -340,6 +345,7 @@ where
                     _ => unreachable!(),
                 }
             }
+            Some(PassThroughFlag) |
             Some(PassThrough(_)) |
             Some(PassThroughPath(_)) => &mut common_args,
             Some(ExtraHashFile(path)) => {

diff --git a/src/compiler/msvc.rs b/src/compiler/msvc.rs
@@ -350,6 +350,7 @@ pub fn parse_arguments(arguments: &[OsString], cwd: &Path, is_clang: bool) -> Co
                     _ => unreachable!(),
                 }
             }
+            Some(PassThroughFlag) |
             Some(PassThrough(_)) |
             Some(PassThroughPath(_)) => &mut common_args,
             Some(ExtraHashFile(path)) => {