Merge "Update docs"
diff --git a/fargo-test/.gitignore b/fargo-test/.gitignore
new file mode 100644
index 0000000..ffa3bbd
--- /dev/null
+++ b/fargo-test/.gitignore
@@ -0,0 +1 @@
+Cargo.lock
\ No newline at end of file
diff --git a/fargo-test/Cargo.lock b/fargo-test/Cargo.lock
deleted file mode 100644
index 10b166e..0000000
--- a/fargo-test/Cargo.lock
+++ /dev/null
@@ -1,96 +0,0 @@
-[root]
-name = "fargo-test"
-version = "0.1.0"
-dependencies = [
- "apps_mozart_services_buffers 0.1.0 (git+https://fuchsia.googlesource.com/fuchsia-crates)",
- "magenta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mxruntime 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "apps_mozart_services_buffers"
-version = "0.1.0"
-source = "git+https://fuchsia.googlesource.com/fuchsia-crates#108eac120fefdb479fce49ec73b4d9ca1ad714ce"
-dependencies = [
- "fidl 0.1.0 (git+https://fuchsia.googlesource.com/fuchsia-crates)",
- "magenta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "bitflags"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "byteorder"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "conv"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "custom_derive"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "fidl"
-version = "0.1.0"
-source = "git+https://fuchsia.googlesource.com/fuchsia-crates#108eac120fefdb479fce49ec73b4d9ca1ad714ce"
-dependencies = [
- "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "magenta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "magenta"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "magenta-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "magenta-sys"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "mxruntime"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "magenta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "magenta-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mxruntime-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "mxruntime-sys"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "magenta-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[metadata]
-"checksum apps_mozart_services_buffers 0.1.0 (git+https://fuchsia.googlesource.com/fuchsia-crates)" = "<none>"
-"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
-"checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-"checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
-"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
-"checksum fidl 0.1.0 (git+https://fuchsia.googlesource.com/fuchsia-crates)" = "<none>"
-"checksum magenta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92159d95603bd96e44850aa5b458656a372b3324940f3523a20d08f0f9cd8760"
-"checksum magenta-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07fd18dd6819f5a24387638769d95fe6e9145eb15c1756d721620604306b7b72"
-"checksum mxruntime 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d267fa561985cefb55172834a020f0e77339dbda7287482fd4b58936e792089a"
-"checksum mxruntime-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3f2afc13950ce3a42515cfc3bdc949f552b0e71109c52481d250ec0e0d9eb8"
diff --git a/fargo-test/Cargo.toml b/fargo-test/Cargo.toml
index e641a4c..b854e9b 100644
--- a/fargo-test/Cargo.toml
+++ b/fargo-test/Cargo.toml
@@ -4,7 +4,7 @@
authors = ["Rob Tsuk <robtsuk@google.com>"]
[dependencies]
-magenta = "0.1.0"
+fuchsia-zircon = "0.2.0"
mxruntime = "0.1.0"
apps_mozart_services_buffers = { git = "https://fuchsia.googlesource.com/fuchsia-crates" }
diff --git a/src/sdk.rs b/src/sdk.rs
index c19b52f..3144857 100644
--- a/src/sdk.rs
+++ b/src/sdk.rs
@@ -76,8 +76,8 @@
pub fn toolchain_path() -> Result<PathBuf> {
let platform_name =
- if is_mac() { "clang+llvm-x86_64-darwin" } else { "clang+llvm-x86_64-linux" };
- Ok(fuchsia_root()?.join("buildtools").join("toolchain").join(platform_name))
+ if is_mac() { "mac-x64" } else { "linux-x64" };
+ Ok(fuchsia_root()?.join("buildtools").join(platform_name).join("clang"))
}
pub fn clang_linker_path() -> Result<PathBuf> {
