Merge branch 'master' into master

Author: luser

README.md

@@ -11,6 +11,20 @@ It works as a client-server. The client spawns a server if one is not running al
 
 Sccache can also be used with local storage instead of remote.
 
+---
+
+Table of Contents (ToC)
+======================
+
+* [Build Requirements](#build-requirements)
+* [Build](#build)
+* [Installation](#installation)
+* [Usage](#usage)
+* [Storage Options](#storage-options)
+* [Debugging](#debugging)
+* [Known Caveats](#known-caveats)
+
+---
 
 Build Requirements
 ------------------
@@ -27,6 +41,8 @@ We recommend you install Rust via [Rustup](https://rustup.rs/). The generated bi
 
 > $ cargo install
 
+---
+
 Usage
 -----
 
@@ -48,10 +64,12 @@ Running `sccache --show-stats` will print a summary of cache statistics.
 
 Some notes about using `sccache` with [Jenkins](https://jenkins.io) are [here](docs/Jenkins.md).
 
+---
+
 Storage Options
 ---------------
 
-Sccache defaults to using local disk storage. You can set the `SCCACHE_DIR` environment variable to change the disk cache location. By default it will use a sensible location for the current platform: `~/.cache/sccache` on Linux, `%LOCALAPPDATA%\Mozilla\sccache` on Windows, `~/Library/Caches/sccache` on OS X.
+Sccache defaults to using local disk storage. You can set the `SCCACHE_DIR` environment variable to change the disk cache location. By default it will use a sensible location for the current platform: `~/.cache/sccache` on Linux, `%LOCALAPPDATA%\Mozilla\sccache` on Windows, and `~/Library/Caches/sccache` on OS X.
 
 If you want to use S3 storage for the sccache cache, you need to set the `SCCACHE_BUCKET` environment variable to the name of the S3 bucket to use. You can use `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` to set the S3 credentials and if you need to override the default endpoint you can set `SCCACHE_ENDPOINT`. To connect to a minio storage for example you can set `SCCACHE_ENDPOINT=<ip>:<port>`.
 
@@ -63,6 +81,8 @@ By default, SCCACHE on GCS will be read-only. To change this, set `SCCACHE_GCS_R
 
 *Important:* The environment variables are only taken into account when the server starts, so only on the first run.
 
+---
+
 Debugging
 ---------
 
@@ -72,6 +92,7 @@ Alternately, you can run the server manually in foreground mode by running `SCCA
 
 You can set the `SCCACHE_ERROR_LOG` environment variable to a path to cause the server process to redirect its standard error output there, in order to capture the output of unhandled panics. (The server sets `RUST_BACKTRACE=1` internally.)
 
+---
 
 Known caveats
 -------------

src/compiler/clang.rs

@@ -79,12 +79,13 @@ impl CCompilerImpl for Clang {
     }
 }
 
-static ARGS: [(ArgInfo, gcc::GCCArgAttribute); 7] = [
+static ARGS: [(ArgInfo, gcc::GCCArgAttribute); 8] = [
     take_arg!("--serialize-diagnostics", String, Separated, PassThrough),
     take_arg!("--target", String, Separated, PassThrough),
     take_arg!("-Xclang", String, Separated, PassThrough),
     flag!("-fcxx-modules", TooHard),
     flag!("-fmodules", TooHard),
+    take_arg!("-gcc-toolchain", String, Separated, PassThrough),
     take_arg!("-include-pch", Path, CanBeSeparated, PreprocessorArgument),
     take_arg!("-target", String, Separated, PassThrough),
 ];
@@ -145,6 +146,7 @@ mod test {
         parses!("-c", "foo.c", "-Xclang", "-load", "-Xclang", "moz-check", "-o", "foo.o");
         parses!("-c", "foo.c", "-B", "somewhere", "-o", "foo.o");
         parses!("-c", "foo.c", "-target", "x86_64-apple-darwin11", "-o", "foo.o");
+        parses!("-c", "foo.c", "-gcc-toolchain", "somewhere", "-o", "foo.o");
     }
 
     #[test]

src/compiler/rust.rs

@@ -64,7 +64,7 @@ pub struct RustHasher {
     parsed_args: ParsedArguments,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct ParsedArguments {
     /// The full commandline, with arguments and their values as pairs.
     arguments: Vec<(OsString, Option<OsString>)>,
@@ -323,7 +323,7 @@ static ARGS: [(ArgInfo, RustArgAttribute); 33] = [
     take_arg!("--cap-lints", Path, CanBeSeparated('='), PassThrough),
     take_arg!("--cfg", Path, CanBeSeparated('='), PassThrough),
     take_arg!("--codegen", Path, CanBeSeparated('='), CodeGen),
-    take_arg!("--color", Path, CanBeSeparated('='), CodeGen),
+    take_arg!("--color", Path, CanBeSeparated('='), PassThrough),
     take_arg!("--crate-name", String, CanBeSeparated('='), CrateName),
     take_arg!("--crate-type", String, CanBeSeparated('='), CrateType),
     take_arg!("--deny", Path, CanBeSeparated('='), PassThrough),
@@ -341,16 +341,16 @@ static ARGS: [(ArgInfo, RustArgAttribute); 33] = [
     take_arg!("--unpretty", String, CanBeSeparated('='), NotCompilation),
     flag!("--version", NotCompilation),
     take_arg!("--warn", Path, CanBeSeparated('='), PassThrough),
-    take_arg!("-A", Path, CanBeSeparated('='), LinkPath),
-    take_arg!("-C", Path, CanBeSeparated('='), CodeGen),
-    take_arg!("-D", Path, CanBeSeparated('='), CodeGen),
-    take_arg!("-F", Path, CanBeSeparated('='), CodeGen),
-    take_arg!("-L", Path, CanBeSeparated('='), LinkPath),
+    take_arg!("-A", String, CanBeSeparated, PassThrough),
+    take_arg!("-C", String, CanBeSeparated, CodeGen),
+    take_arg!("-D", String, CanBeSeparated, PassThrough),
+    take_arg!("-F", String, CanBeSeparated, PassThrough),
+    take_arg!("-L", Path, CanBeSeparated, LinkPath),
     flag!("-V", NotCompilation),
-    take_arg!("-W", Path, CanBeSeparated('='), LinkPath),
-    take_arg!("-Z", Path, CanBeSeparated('='), LinkPath),
-    take_arg!("-l", Path, CanBeSeparated('='), LinkLibrary),
-    take_arg!("-o", Path, CanBeSeparated('='), TooHard),
+    take_arg!("-W", String, CanBeSeparated, PassThrough),
+    take_arg!("-Z", String, CanBeSeparated, PassThrough),
+    take_arg!("-l", Path, CanBeSeparated, LinkLibrary),
+    take_arg!("-o", Path, CanBeSeparated, TooHard),
 ];
 
 fn parse_arguments(arguments: &[OsString], cwd: &Path) -> CompilerArguments<ParsedArguments>
@@ -759,6 +759,10 @@ mod test {
         assert!(h.dep_info.is_none());
         let h = parses!("--emit", "link", "foo.rs", "--out-dir=out", "--crate-name=foo");
         assert_eq!(h.output_dir.to_str(), Some("out"));
+        assert_eq!(parses!("--emit", "link", "-C", "opt-level=1", "foo.rs",
+                           "--out-dir", "out", "--crate-name", "foo"),
+                   parses!("--emit=link", "-Copt-level=1", "foo.rs",
+                           "--out-dir=out", "--crate-name=foo"));
         let h = parses!("--emit", "link,dep-info", "foo.rs", "--out-dir", "out",
                         "--crate-name", "my_crate",
                         "-C", "extra-filename=-abcxyz");