File tree Expand file tree Collapse file tree 2 files changed +1
-13
lines changed Expand file tree Collapse file tree 2 files changed +1
-13
lines changed Original file line number Diff line number Diff line change @@ -914,12 +914,7 @@ def build_bootstrap_cmd(self, env):
914
914
915
915
# preserve existing RUSTFLAGS
916
916
env.setdefault("RUSTFLAGS", "")
917
- # we need to explicitly add +xgot here so that we can successfully bootstrap
918
- # a usable stage1 compiler
919
- # FIXME: remove this if condition on the next bootstrap bump
920
- # cfg(bootstrap)
921
- if self.build_triple().startswith('mips'):
922
- env["RUSTFLAGS"] += " -Ctarget-feature=+xgot"
917
+
923
918
target_features = []
924
919
if self.get_toml("crt-static", build_section) == "true":
925
920
target_features += ["+crt-static"]
Original file line number Diff line number Diff line change @@ -228,13 +228,6 @@ fn copy_third_party_objects(
228
228
) -> Vec<(PathBuf, DependencyType)> {
229
229
let mut target_deps = vec![];
230
230
231
- // FIXME: remove this in 2021
232
- if target == "x86_64-fortanix-unknown-sgx" {
233
- if env::var_os("X86_FORTANIX_SGX_LIBS").is_some() {
234
- builder.info("Warning: X86_FORTANIX_SGX_LIBS environment variable is ignored, libunwind is now compiled as part of rustbuild");
235
- }
236
- }
237
-
238
231
if builder.config.sanitizers_enabled(target) && compiler.stage != 0 {
239
232
// The sanitizers are only copied in stage1 or above,
240
233
// to avoid creating dependency on LLVM.
You can’t perform that action at this time.
0 commit comments