diff options
| author | bors <bors@rust-lang.org> | 2022-12-29 22:21:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-29 22:21:16 +0000 |
| commit | 2c7536eaae59b44ff5259183ca98384129d69dd0 (patch) | |
| tree | e959074255f6e8c881bd5c6deb8c966732c9acd7 /src/bootstrap/bootstrap.py | |
| parent | ad8ae0504c54bc2bd8306abfcfe8546c1bb16a49 (diff) | |
| parent | 480297d216cbaad9527b7004222cd6c1faaa5e74 (diff) | |
| download | rust-2c7536eaae59b44ff5259183ca98384129d69dd0.tar.gz rust-2c7536eaae59b44ff5259183ca98384129d69dd0.zip | |
Auto merge of #105920 - MarcusCalhoun-Lopez:respect_set, r=jyn514
Respect --set=target.platform when building rustbuild itself `--set=target.platform.cc` and `--set=target.platform.cxx` are ignored if target is quoted. `--set=target.platform.linker` is ignored if RUSTFLAGS is not set. Undo parts of https://github.com/rust-lang/rust/commit/d1291dc8b4ac9a98ff1d286402559e4ba5d68488 and https://github.com/rust-lang/rust/commit/1532fd8cd0db93f469e414f9da31ef083a44fcba
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 2d5018d934e..9cf43fc7a21 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -753,6 +753,9 @@ class RustBuild(object): target_features += ["-crt-static"] if target_features: env["RUSTFLAGS"] += " -C target-feature=" + (",".join(target_features)) + target_linker = self.get_toml("linker", build_section) + if target_linker is not None: + env["RUSTFLAGS"] += " -C linker=" + target_linker env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes" env["RUSTFLAGS"] += " -Wsemicolon_in_expressions_from_macros" if self.get_toml("deny-warnings", "rust") != "false": |