Skip to content

The compiler_builtins library is now a crates.io dependency of alloc #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2018
Merged

The compiler_builtins library is now a crates.io dependency of alloc #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 8 additions & 45 deletions src/sysroot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ fn build(
util::mkdir(&dst)?;

build_libcore(cmode, &ctoml, home, src, &dst, verbose)?;
build_libcompiler_builtins(cmode, &ctoml, home, src, &dst, config, verbose)?;
build_liballoc(cmode, &ctoml, home, src, &dst, verbose)?;
build_liballoc(cmode, &ctoml, home, src, &dst, config, verbose)?;

// Create hash file
util::write(&rustlib.parent().join(".hash"), &hash.to_string())?;
Expand Down Expand Up @@ -114,8 +113,7 @@ fn build_crate(
}

cmd.arg("--");
cmd.arg("--sysroot");
cmd.arg(home.display().to_string());
cmd.env("RUSTFLAGS", &format!("--sysroot {}", home.display()));
cmd.arg("-Z");
cmd.arg("force-unstable-if-unmarked");

Expand Down Expand Up @@ -162,7 +160,7 @@ version = "0.0.0"
build_crate("core", stoml, cmode, ctoml, home, dst, verbose)
}

fn build_libcompiler_builtins(
fn build_liballoc(
cmode: &CompilationMode,
ctoml: &cargo::Toml,
home: &Home,
Expand All @@ -174,53 +172,18 @@ fn build_libcompiler_builtins(
const TOML: &'static str = r#"
[package]
authors = ["The Rust Project Developers"]
name = "sysroot"
name = "alloc"
version = "0.0.0"

[dependencies.compiler_builtins]
version = "0.1.0"
"#;

let mut stoml = TOML.to_owned();

let path = src.path()
.join("libcompiler_builtins")
.display()
.to_string();
let mut compiler_builtin_dep = Table::new();
compiler_builtin_dep.insert("path".to_owned(), Value::String(path));

let mut features = vec![Value::String("compiler-builtins".to_owned())];
if config.memcpy {
features.push(Value::String("mem".to_owned()));
stoml.push_str("features = [\"mem\"]\n");
}
compiler_builtin_dep.insert("default-features".to_owned(), Value::Boolean(false));
compiler_builtin_dep.insert("features".to_owned(), Value::Array(features));
let mut deps = Table::new();
deps.insert(
"compiler_builtins".to_owned(),
Value::Table(compiler_builtin_dep),
);
let mut map = Table::new();
map.insert("dependencies".to_owned(), Value::Table(deps));
stoml.push_str(&Value::Table(map).to_string());

build_crate("compiler_builtins", stoml, cmode, ctoml, home, dst, verbose)
}

fn build_liballoc(
cmode: &CompilationMode,
ctoml: &cargo::Toml,
home: &Home,
src: &Src,
dst: &Path,
verbose: bool,
) -> Result<()> {
const TOML: &'static str = r#"
[package]
authors = ["The Rust Project Developers"]
name = "alloc"
version = "0.0.0"
"#;

let mut stoml = TOML.to_owned();

let path = src.path().join("liballoc/lib.rs").display().to_string();
let mut map = Table::new();
Expand Down