bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #113683 - ozkanonur:polished, r=jyn514

Browse source 
remove outdated `FIXME`s in bootstrap internals

self-explanatory
This commit is contained in:
Matthias Krüger 2023-07-15 19:42:52 +02:00 • committed by GitHub
commit d0ef799156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bootstrap/bootstrap.py
View file

@ -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"]

7
src/bootstrap/compile.rs
View file

@ -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.