about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorozkanonur <work@onurozkan.dev>2023-07-14 20:50:45 +0300
committerozkanonur <work@onurozkan.dev>2023-07-14 21:03:34 +0300
commit5e1ac1eb8b7a5400698b179c445a07afc34eb74c (patch)
tree34e1e7825b0928314d493cbf0c153de4b3b5cfef /src/bootstrap
parentfe03b46ee4688a99d7155b4f9dcd875b6903952d (diff)
remove outdated FIXMEs on bootstrap
Signed-off-by: ozkanonur <work@onurozkan.dev>
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/bootstrap.py7
-rw-r--r--src/bootstrap/compile.rs7
2 files changed, 1 insertions, 13 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index e5a710c0a96..a6b99150f96 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 caa7417011e..ccdb1ae89e2 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.