Commit 62fcc612 authored by Alex Hornby's avatar Alex Hornby Committed by Facebook GitHub Bot

pick rust installation independently of --facebook-internal

Summary: Create a new fbsource property for manifests so we can still use monorepo rust toolchain when running builds with --no-facebook-internal

Differential Revision: D33945559

fbshipit-source-id: 606af62e03d09c3529018af4478bcafecd0cd640
parent 96978d34
...@@ -185,6 +185,7 @@ class BuildOptions(object): ...@@ -185,6 +185,7 @@ class BuildOptions(object):
"distro": host_type.distro, "distro": host_type.distro,
"distro_vers": host_type.distrovers, "distro_vers": host_type.distrovers,
"fb": "on" if facebook_internal else "off", "fb": "on" if facebook_internal else "off",
"fbsource": "on" if self.fbsource_dir else "off",
"test": "off", "test": "off",
"shared_libs": "on" if self.shared_libs else "off", "shared_libs": "on" if self.shared_libs else "off",
} }
......
...@@ -586,7 +586,15 @@ class ManifestContext(object): ...@@ -586,7 +586,15 @@ class ManifestContext(object):
This object should be passed as the `ctx` parameter in ManifestParser.get() calls. This object should be passed as the `ctx` parameter in ManifestParser.get() calls.
""" """
ALLOWED_VARIABLES = {"os", "distro", "distro_vers", "fb", "test", "shared_libs"} ALLOWED_VARIABLES = {
"os",
"distro",
"distro_vers",
"fb",
"fbsource",
"test",
"shared_libs",
}
def __init__(self, ctx_dict): def __init__(self, ctx_dict):
assert set(ctx_dict.keys()) == self.ALLOWED_VARIABLES assert set(ctx_dict.keys()) == self.ALLOWED_VARIABLES
......
...@@ -24,7 +24,7 @@ pexpect ...@@ -24,7 +24,7 @@ pexpect
python-toml python-toml
python-filelock python-filelock
[dependencies.fb=on] [dependencies.fbsource=on]
rust rust
# macOS ships with sqlite3, and some of the core system # macOS ships with sqlite3, and some of the core system
......
...@@ -56,5 +56,5 @@ rust-shed ...@@ -56,5 +56,5 @@ rust-shed
[dependencies.not(os=linux)] [dependencies.not(os=linux)]
openssl openssl
[dependencies.fb=on] [dependencies.fbsource=on]
rust rust
...@@ -30,5 +30,5 @@ fbthrift ...@@ -30,5 +30,5 @@ fbthrift
[dependencies.not(os=linux)] [dependencies.not(os=linux)]
openssl openssl
[dependencies.fb=on] [dependencies.fbsource=on]
rust rust
...@@ -19,7 +19,7 @@ folly ...@@ -19,7 +19,7 @@ folly
pcre pcre
googletest googletest
[dependencies.fb=on] [dependencies.fbsource=on]
rust rust
[shipit.pathmap] [shipit.pathmap]
......
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