diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-15 19:42:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-15 19:42:52 +0200 |
| commit | d0ef799156d052b8404b9938b1ad221759f27d07 (patch) | |
| tree | cfb6696de9172083bf7cd0ef60210eb7f4465024 | |
| parent | 9b8be2f0e10f68a90ddc1202854869965d44e1d0 (diff) | |
| parent | 5e1ac1eb8b7a5400698b179c445a07afc34eb74c (diff) | |
| download | rust-d0ef799156d052b8404b9938b1ad221759f27d07.tar.gz rust-d0ef799156d052b8404b9938b1ad221759f27d07.zip | |
Rollup merge of #113683 - ozkanonur:polished, r=jyn514
remove outdated `FIXME`s in bootstrap internals self-explanatory
| -rw-r--r-- | src/bootstrap/bootstrap.py | 7 | ||||
| -rw-r--r-- | src/bootstrap/compile.rs | 7 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index f5ee45c6a27..fe66b1d41bf 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -914,12 +914,7 @@ class RustBuild(object): # preserve existing RUSTFLAGS env.setdefault("RUSTFLAGS", "") - # we need to explicitly add +xgot here so that we can successfully bootstrap - # a usable stage1 compiler - # FIXME: remove this if condition on the next bootstrap bump - # cfg(bootstrap) - if self.build_triple().startswith('mips'): - env["RUSTFLAGS"] += " -Ctarget-feature=+xgot" + target_features = [] if self.get_toml("crt-static", build_section) == "true": target_features += ["+crt-static"] diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index d9f14a7ccdf..f3d95b57a76 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -222,13 +222,6 @@ fn copy_third_party_objects( ) -> Vec<(PathBuf, DependencyType)> { let mut target_deps = vec![]; - // FIXME: remove this in 2021 - if target == "x86_64-fortanix-unknown-sgx" { - if env::var_os("X86_FORTANIX_SGX_LIBS").is_some() { - builder.info("Warning: X86_FORTANIX_SGX_LIBS environment variable is ignored, libunwind is now compiled as part of rustbuild"); - } - } - if builder.config.sanitizers_enabled(target) && compiler.stage != 0 { // The sanitizers are only copied in stage1 or above, // to avoid creating dependency on LLVM. |