mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustbuild: Untie debuginfo-level-tests from debuginfo-level

Browse source
This commit is contained in:
Vadim Petrochenkov 2019-05-24 02:11:33 +03:00
parent 3da7bbc6da
commit 763470dc13
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config.toml.example
View file

@ -301,11 +301,13 @@
# library.
#debug-assertions = false
# Debuginfo level for Rust code, corresponds to the `-C debuginfo=N` option of `rustc`.
# Debuginfo level for most of Rust code, corresponds to the `-C debuginfo=N` option of `rustc`.
# `0` - no debug info
# `1` - line tables only
# `2` - full debug info with variable and type information
# Can be overriden for specific subsets of Rust code (rustc, std, tools or tests).
# Can be overriden for specific subsets of Rust code (rustc, std or tools).
# Debuginfo for tests run with compiletest is not controlled by this option
# and needs to be enabled separately with `debuginfo-level-tests`.
#debuginfo-level = if debug { 2 } else { 0 }
# Debuginfo level for the compiler.
@ -318,7 +320,7 @@
#debuginfo-level-tools = debuginfo-level
# Debuginfo level for the test suites run with compiletest.
#debuginfo-level-tests = debuginfo-level
#debuginfo-level-tests = 0
# Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
#backtrace = true

2
src/bootstrap/config.rs
View file

@ -650,7 +650,7 @@ impl Config {
config.rust_debuginfo_level_rustc = with_defaults(debuginfo_level_rustc);
config.rust_debuginfo_level_std = with_defaults(debuginfo_level_std);
config.rust_debuginfo_level_tools = with_defaults(debuginfo_level_tools);
config.rust_debuginfo_level_tests = with_defaults(debuginfo_level_tests);
config.rust_debuginfo_level_tests = debuginfo_level_tests.unwrap_or(0);
let default = config.channel == "dev";
config.ignore_git = ignore_git.unwrap_or(default);