Commit 857c6a5b authored by Lukas Piatkowski's avatar Lukas Piatkowski Committed by Facebook Github Bot

getdeps: add manifest for Rust toolchain

Reviewed By: ikostia

Differential Revision: D18814410

fbshipit-source-id: 889306e51c03a29c2b72e34b7dc60db21f11ff97
parent e131c44a
......@@ -234,6 +234,19 @@ class BuildOptions(object):
if os.path.exists(bindir):
add_path_entry(env, "PATH", bindir, append=False)
# If rustc is present in the `bin` directory, set RUSTC to prevent
# cargo uses the rustc installed in the system.
if self.is_windows():
rustc_path = os.path.join(bindir, "rustc.bat")
rustdoc_path = os.path.join(bindir, "rustdoc.bat")
else:
rustc_path = os.path.join(bindir, "rustc")
rustdoc_path = os.path.join(bindir, "rustdoc")
if os.path.isfile(rustc_path):
env["RUSTC"] = rustc_path
env["RUSTDOC"] = rustdoc_path
return env
......
......@@ -21,6 +21,9 @@ libgit2
lz4
python-toml
[dependencies.fb=on]
rust-stable
# macOS ships with sqlite3, and some of the core system
# frameworks require that that version be linked rather
# than the one we might build for ourselves here, so we
......
......@@ -24,3 +24,6 @@ tools/rust/ossconfigs = .
[dependencies]
fbthrift
[dependencies.fb=on]
rust-nightly
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment