diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2021-01-30 13:37:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 13:37:03 +0900 |
| commit | e3905aa5af01ec9104253ed2d1b5b9ce81e98651 (patch) | |
| tree | 4e45cbe0b975068ea1db23ffe34dadd70f87a2b1 | |
| parent | 5df611c5b18ecc9e82c9c3baf465e65e97555963 (diff) | |
| parent | 807b5f5591e5c726e7965c0d5ff308b0dc1e874f (diff) | |
| download | rust-e3905aa5af01ec9104253ed2d1b5b9ce81e98651.tar.gz rust-e3905aa5af01ec9104253ed2d1b5b9ce81e98651.zip | |
Rollup merge of #81519 - jyn514:rustup-toolchain, r=Mark-Simulacrum
Don't print error output from rustup when detecting default build triple
Before, it could print this error if no toolchain was configured:
```
error: no default toolchain configured
error: backtrace:
error: stack backtrace:
0: error_chain::backtrace::imp::InternalBacktrace::new
1: rustup::config::Cfg::toolchain_for_dir
2: rustup_init::run_rustup_inner
3: rustup_init::main
4: std::rt::lang_start::{{closure}}
5: main
6: __libc_start_main
7: _start
```
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 8576f57959a..5b0b89cc2db 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -194,7 +194,8 @@ def default_build_triple(verbose): # being detected as GNU instead of MSVC. default_encoding = sys.getdefaultencoding() try: - version = subprocess.check_output(["rustc", "--version", "--verbose"]) + version = subprocess.check_output(["rustc", "--version", "--verbose"], + stderr=subprocess.DEVNULL) version = version.decode(default_encoding) host = next(x for x in version.split('\n') if x.startswith("host: ")) triple = host.split("host: ")[1] |
