bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Automatically vendor Cargo deps when building the source tarballs.

Browse source
This commit is contained in:
Eduard-Mihai Burtescu 2017-02-10 22:59:40 +02:00
parent 42c1ea2915
commit d29f0bc8fa
27 changed files with 106 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/bootstrap.py
View file

@ -294,6 +294,8 @@ class RustBuild(object):
raise Exception("no cargo executable found at `%s`" % self.cargo())
args = [self.cargo(), "build", "--manifest-path",
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
if self.use_locked_deps:
args.append("--locked")
if self.use_vendored_sources:
args.append("--frozen")
self.run(args, env)
@ -440,6 +442,9 @@ def main():
rb.use_vendored_sources = '\nvendor = true' in rb.config_toml or \
'CFG_ENABLE_VENDOR' in rb.config_mk
rb.use_locked_deps = '\nlocked-deps = true' in rb.config_toml or \
'CFG_ENABLE_LOCKED_DEPS' in rb.config_mk
if 'SUDO_USER' in os.environ and not rb.use_vendored_sources:
if os.environ.get('USER') != os.environ['SUDO_USER']:
rb.use_vendored_sources = True