about summary refs log tree commit diff
path: root/src/test/debuginfo/enum-thinlto.rs
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2020-05-14 10:22:54 +0200
committerGitHub <noreply@github.com>2020-05-14 10:22:54 +0200
commit577da45097e439c1aefd853b9ff41f305449b848 (patch)
tree21c36cbe5fa4697ad1fb7e50e0df764ab0c8bd22 /src/test/debuginfo/enum-thinlto.rs
parenta6c1f61db7a5503a5ea42da200cab8dbb55e1594 (diff)
parent34b2072599c2d14a36ed8cb7adeb0db44b8f76b3 (diff)
downloadrust-577da45097e439c1aefd853b9ff41f305449b848.tar.gz
rust-577da45097e439c1aefd853b9ff41f305449b848.zip
Rollup merge of #71964 - jcotton42:bootstrap_decode_none_windows, r=Mark-Simulacrum
Fix bootstrap failing on win32

```powershell
python x.py -h # or really any x.py command
```
would fail with
```
info: Downloading and building bootstrap before processing --help
      command. See src/bootstrap/README.md for help with common
      commands.
Updating only changed submodules
Submodules updated in 0.15 seconds
Traceback (most recent call last):
  File "x.py", line 11, in <module>
    bootstrap.main()
  File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 960, in main
    bootstrap(help_triggered)
  File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 925, in bootstrap
    build.build = args.build or build.build_triple()
  File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 731, in build_triple
    return default_build_triple()
  File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 184, in default_build_triple
    ostype = require(["uname", "-s"], exit=required).decode(default_encoding)
AttributeError: 'NoneType' object has no attribute 'decode'
```

This PR defers the `decode` call until after we're sure `ostype` and `cputype` are not `None`, as they would be on Windows since `uname` doesn't exist
Diffstat (limited to 'src/test/debuginfo/enum-thinlto.rs')
0 files changed, 0 insertions, 0 deletions