diff options
| author | bors <bors@rust-lang.org> | 2016-09-04 06:06:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-04 06:06:37 -0700 |
| commit | 987b47549eae03e4d9699336f5e30f787161acaa (patch) | |
| tree | 5e7eb63f8f244e3d1961b69dacb8bfeacdff849b /src/bootstrap | |
| parent | e77d86c142ae668038dd43594d04022cbd6bf4d8 (diff) | |
| parent | 55893f0da7427c14be55837fada2d062db387ec9 (diff) | |
| download | rust-987b47549eae03e4d9699336f5e30f787161acaa.tar.gz rust-987b47549eae03e4d9699336f5e30f787161acaa.zip | |
Auto merge of #36255 - Manishearth:rollup, r=Manishearth
Rollup of 7 pull requests - Successful merges: #36070, #36132, #36200, #36212, #36225, #36231, #36234 - Failed merges:
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/config.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/config.toml.example | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 682a6f74126..c1af7bd794c 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -144,6 +144,7 @@ struct Rust { rpath: Option<bool>, optimize_tests: Option<bool>, debuginfo_tests: Option<bool>, + codegen_tests: Option<bool>, } /// TOML representation of how each build target is configured. @@ -232,6 +233,7 @@ impl Config { set(&mut config.rust_optimize, rust.optimize); set(&mut config.rust_optimize_tests, rust.optimize_tests); set(&mut config.rust_debuginfo_tests, rust.debuginfo_tests); + set(&mut config.codegen_tests, rust.codegen_tests); set(&mut config.rust_rpath, rust.rpath); set(&mut config.debug_jemalloc, rust.debug_jemalloc); set(&mut config.use_jemalloc, rust.use_jemalloc); diff --git a/src/bootstrap/config.toml.example b/src/bootstrap/config.toml.example index 2894adafef6..fcbd1d33309 100644 --- a/src/bootstrap/config.toml.example +++ b/src/bootstrap/config.toml.example @@ -1,5 +1,8 @@ # Sample TOML configuration file for building Rust. # +# To configure rustbuild, copy this file to the directory from which you will be +# running the build, and name it config.toml. +# # All options are commented out by default in this file, and they're commented # out with their default values. The build system by default looks for # `config.toml` in the current directory of a build for build configuration, but @@ -130,6 +133,10 @@ #optimize-tests = true #debuginfo-tests = true +# Flag indicating whether codegen tests will be run or not. If you get an error +# saying that the FileCheck executable is missing, you may want to disable this. +#codegen-tests = true + # ============================================================================= # Options for specific targets # |