From 5e1ac1eb8b7a5400698b179c445a07afc34eb74c Mon Sep 17 00:00:00 2001
From: ozkanonur <work@onurozkan.dev>
Date: Fri, 14 Jul 2023 20:50:45 +0300
Subject: [PATCH] remove outdated FIXMEs on bootstrap
Signed-off-by: ozkanonur <work@onurozkan.dev>
---
src/bootstrap/bootstrap.py | 7 +------
src/bootstrap/compile.rs | 7 -------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index e5a710c0a9646..a6b99150f962f 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -914,12 +914,7 @@ def build_bootstrap_cmd(self, env):
# 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 caa7417011ecc..ccdb1ae89e2f2 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -228,13 +228,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.