.gitignore

@@ -77,6 +77,7 @@
/stage3/
/test/
/tmp/
Cargo.lock
TAGS
TAGS.emacs
TAGS.vi
@@ -89,6 +90,7 @@ lexer.ml
src/.DS_Store
src/etc/dl
src/librustc_llvm/llvmdeps.rs
target/
tmp.*.rs
version.md
version.ml

Cargo.toml

@@ -0,0 +1,33 @@
[package]
name = "std_group"
version = "1.0.0"
authors = ["The Rust Project Developers"]

[lib]
name = "std_group"
path = "src/libsystem/deps/dummy.rs"

[dependencies]
system = { path = "src/libsystem", optional = true, default-features = false }
std = { path = "src/libstd", optional = true, default-features = false }
alloc_system = { path = "src/liballoc_system", optional = true }
alloc_jemalloc = { path = "src/liballoc_jemalloc", optional = true }

arena = { path = "src/libarena", optional = true }
collectionstest = { path = "src/libcollectionstest", optional = true }
coretest = { path = "src/libcoretest", optional = true }
fmt_macros = { path = "src/libfmt_macros", optional = true }
flate = { path = "src/libflate", optional = true }
getopts = { path = "src/libgetopts", optional = true }
graphviz = { path = "src/libgraphviz", optional = true }
log = { path = "src/liblog", optional = true }
rbml = { path = "src/librbml", optional = true }
serialize = { path = "src/libserialize", optional = true }
term = { path = "src/libterm", optional = true }
syntax = { path = "src/libsyntax", optional = true }
test = { path = "src/libtest", optional = true }

[features]
libstd = [ "system", "std", "system/rust_builtin", "system/compiler-rt", "system/backtrace", "alloc_system", "alloc_jemalloc" ]
libstd_light = [ "system", "std", "system/disable-backtrace", "alloc_system" ]
deps = [ "arena", "collectionstest", "coretest", "fmt_macros", "flate", "getopts", "graphviz", "log", "rbml", "serialize", "syntax", "term", "test" ]

cargobuild

@@ -0,0 +1,56 @@
#!/bin/bash
set -eu

if [ $# -lt 1 ]; then
	echo Usage: $0 TARGET [LLVM_CONFIG]
	echo ex: $0 x86_64-unknown-linux-gnu /usr/bin/llvm-config
	exit 1
fi

ROOT="$PWD"
TARGET="$1"
PROFILE="debug"
PROFILE="release"

if [ $# -lt 2 ]; then
	LLVM_CONFIG="$ROOT/$TARGET/llvm/Release/bin/llvm-config"
	shift 1
else
	LLVM_CONFIG="$2"
	shift 2
fi

HOST=`$LLVM_CONFIG --host-target`

export RUSTC="$ROOT/rustc-sysroot"
export RUST_TARGET_PATH="$ROOT"
export CARGO_TARGET_DIR="$ROOT/target"
export CFG_LLVM_LINKAGE_FILE="$CARGO_TARGET_DIR/$TARGET/llvmdeps.rs"
export CFG_COMPILER_HOST_TRIPLE="$HOST"
export CFG_LLVM_CONFIG="$LLVM_CONFIG"
export CFG_LLVM_STDCPP="stdc++"

export CARGO_TARGET_DIR="$ROOT/target/std"
cargo build --manifest-path "$ROOT/Cargo.toml" --target $TARGET --features libstd "$@"
#cargo build --manifest-path "$ROOT/Cargo.toml" --target $TARGET --features libstd_light "$@"

SYSROOT="$CARGO_TARGET_DIR/lib/rustlib/$TARGET"
mkdir -p "$SYSROOT/lib"
ln -sf "$CARGO_TARGET_DIR/$TARGET/$PROFILE/deps/lib"{alloc,backtrace,collections,compiler_rt,core,libc,rand,rust_builtin,rustc_bitflags,rustc_unicode,system,std}*.rlib "$SYSROOT/lib/"
ln -sf "$CARGO_TARGET_DIR/$TARGET/$PROFILE/deps/libcompiler_rt.a" "$SYSROOT/lib/"

export CARGO_TARGET_DIR="$ROOT/target/non-std"
export RUSTC_SYSROOT="$SYSROOT/../../../"
cargo build --manifest-path "$ROOT/Cargo.toml" --target $TARGET --features deps "$@"
ln -sf "$CARGO_TARGET_DIR/$TARGET/$PROFILE/deps/lib"{arena,collectionstest,coretest,fmt_macros,flate,getopts,graphviz,log,rbml,serialize,syntax,term,test}*.rlib "$SYSROOT/lib/"

export CARGO_TARGET_DIR="$ROOT/target/staging"
export CFG_LLVM_LINKAGE_FILE="$CARGO_TARGET_DIR/$TARGET/llvmdeps.rs"
#cargo test --manifest-path "$ROOT/src/libsystem/Cargo.toml" --target $TARGET --no-default-features --features "compiler-rt backtrace rust_builtin" "$@"
#cargo test --manifest-path "$ROOT/src/libstd/Cargo.toml" --target $TARGET --no-default-features --features "compiler-rt backtrace rust_builtin" "$@"
#exit
#cargo build --manifest-path "$ROOT/Cargo.toml" --target $TARGET --features libstd "$@"
cargo build --manifest-path "$ROOT/src/librustc_driver/Cargo.toml" --target $TARGET --bin rustc "$@"
cargo build --manifest-path "$ROOT/src/librustdoc/Cargo.toml" --target $TARGET --bin rustdoc "$@"
cargo build --manifest-path "$ROOT/src/compiletest/Cargo.toml" --target $TARGET "$@"
cargo build --manifest-path "$ROOT/src/error-index-generator/Cargo.toml" --target $TARGET "$@"

rustc-sysroot

@@ -0,0 +1,28 @@
#!/bin/bash

if [ -z "$RUSTC_SYSROOT" ]; then
	RUSTC_SYSROOT=/dev/null
fi

if [ -z "$RUSTC_RUSTC" ]; then
	RUSTC_RUSTC=rustc
fi

if [[ "$*" == *"build-script-build"* ]]; then
	IS_BUILD=y
elif [[ "$*" != *"--target"* ]]; then
	IS_BUILD=y
else
	IS_BUILD=
fi

if [ -n "$IS_BUILD" ]; then
	if [ -n "$RUSTC_NATIVE_SYSROOT" ]; then
		exec "$RUSTC_RUSTC" --sysroot="$RUSTC_NATIVE_SYSROOT" "$@"
	else
		exec "$RUSTC_RUSTC" "$@"
	fi
else
	DEPS=`echo "$*" | grep -Eo 'dependency=[^ ]*/deps' | sed 's/^dependency=/-L /' | head -n 1`
	exec "$RUSTC_RUSTC" --sysroot="$RUSTC_SYSROOT" $DEPS "$@"
fi

src/compiletest/Cargo.toml

@@ -0,0 +1,8 @@
[package]
name = "compiletest"
version = "1.0.0"
authors = ["The Rust Project Developers"]

[[bin]]
name = "compiletest"
path = "compiletest.rs"

src/error-index-generator/Cargo.toml

@@ -0,0 +1,11 @@
[package]
name = "error-index-generator"
version = "1.0.0"
authors = ["The Rust Project Developers"]

[[bin]]
name = "error-index-generator"
path = "main.rs"

[dependencies]
rustdoc = { path = "../librustdoc" }

src/liballoc/Cargo.toml

@@ -0,0 +1,11 @@
[package]
name = "alloc"
version = "1.0.0"
authors = ["The Rust Project Developers"]

[lib]
name = "alloc"
path = "lib.rs"

[dependencies]
core = { path = "../libcore" }

src/liballoc_jemalloc/Cargo.toml

@@ -0,0 +1,17 @@
[package]
name = "alloc_jemalloc"
version = "1.0.0"
authors = ["The Rust Project Developers"]
links = "jemalloc"
build = "build.rs"

[lib]
name = "alloc_jemalloc"
path = "lib.rs"

[dependencies]
core = { path = "../libcore" }
libc = { path = "../liblibc" }

[build-dependencies]
gcc = { git = "https://github.com/alexcrichton/gcc-rs.git" }

src/liballoc_jemalloc/build.rs

@@ -0,0 +1,40 @@
use std::process::Command;
use std::fs::rename;
use std::path::PathBuf;
use std::env;

extern crate gcc;

fn main() {
	let dir = env::current_dir().unwrap();
	let out_dir = PathBuf::from(&env::var_os("OUT_DIR").unwrap());

	let config = gcc::Config::new().get_compiler();
	let cflags = config.args().into_iter().cloned().map(|c| c.into_string().unwrap()).fold(String::new(), |mut args, arg| { args.push_str(&arg); args.push(' '); args });

	let jemalloc = dir.join("../jemalloc");

	run(Command::new("sh")
		.env("CFLAGS", cflags)
		.env("CC", config.path())
		.current_dir(&out_dir)
		.arg(jemalloc.join("configure"))
		.arg("--with-jemalloc-prefix=je_")
		.arg("--disable-fill")
		.arg(format!("--host={}", env::var("TARGET").unwrap()))
		.arg(format!("--build={}", env::var("HOST").unwrap())));

	run(Command::new("make")
		.current_dir(&out_dir)
		.arg(&format!("-j{}", env::var("NUM_JOBS").unwrap()))
		.arg(&format!("INCDIR={}", jemalloc.display())));

	rename(&out_dir.join("lib").join("libjemalloc_pic.a"), &out_dir.join("libjemalloc.a")).unwrap();

	println!("cargo:rustc-flags=-L native={} -l static={}", out_dir.display(), "jemalloc");
}

fn run(cmd: &mut Command) {
	println!("running: {:?}", cmd);
	cmd.status().unwrap();
}

src/liballoc_system/Cargo.toml

@@ -0,0 +1,12 @@
[package]
name = "alloc_system"
version = "1.0.0"
authors = ["The Rust Project Developers"]

[lib]
name = "alloc_system"
path = "lib.rs"

[dependencies]
core = { path = "../libcore" }
libc = { path = "../liblibc" }

src/libarena/Cargo.toml

@@ -0,0 +1,8 @@
[package]
name = "arena"
version = "1.0.0"
authors = ["The Rust Project Developers"]

[lib]
name = "arena"
path = "lib.rs"

src/libcollections/Cargo.toml

@@ -0,0 +1,13 @@
[package]
name = "collections"
version = "1.0.0"
authors = ["The Rust Project Developers"]

[lib]
name = "collections"
path = "lib.rs"

[dependencies]
core = { path = "../libcore" }
alloc = { path = "../liballoc" }
rustc_unicode = { path = "../librustc_unicode" }

src/libcollectionstest/Cargo.toml

@@ -0,0 +1,12 @@
[package]
name = "collectionstest"
version = "1.0.0"
authors = ["The Rust Project Developers"]

[lib]
name = "collectionstest"
path = "lib.rs"

[dependencies]
log = { path = "../liblog" }
test = { path = "../libtest" }

src/libcollectionstest/btree/map.rs

@@ -347,6 +347,7 @@ fn test_bad_zst() {
    }
}

#[cfg(test)]
mod bench {
    use std::collections::BTreeMap;
    use std::__rand::{Rng, thread_rng};

src/libcore/Cargo.toml

@@ -0,0 +1,8 @@
[package]
name = "core"
version = "1.0.0"
authors = ["The Project Rust Developers"]

[lib]
name = "core"
path = "lib.rs"

src/libcore/lib.rs

@@ -163,6 +163,7 @@ pub mod simd;

pub mod slice;
pub mod str;
pub mod time;
pub mod hash;
pub mod fmt;

src/libcore/macros.rs

@@ -158,12 +158,10 @@ macro_rules! debug_assert_eq {
/// `libstd` contains a more general `try!` macro that uses `From<E>`.
#[macro_export]
macro_rules! try {
    ($e:expr) => ({
        use $crate::result::Result::{Ok, Err};

        match $e {
            Ok(e) => e,
            Err(e) => return Err(e),
    ($expr:expr) => (match $expr {
        $crate::result::Result::Ok(val) => val,
        $crate::result::Result::Err(err) => {
            return $crate::result::Result::Err($crate::convert::From::from(err))
        }
    })
}