diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-11-04 16:53:48 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-11-05 10:50:26 -0700 |
| commit | 0eff43ff7584d416e6de5d3ade2da1ab17730331 (patch) | |
| tree | 9695b02ee9cb1ba83094f976d7a86be583a9d203 /src/bootstrap/bootstrap.py | |
| parent | 9847bd3d681ef9a80d1b0ff82cbffe70af5aab0b (diff) | |
| parent | a270b8014cbd3af6e03f7f808a2fea1e9f22ed88 (diff) | |
| download | rust-0eff43ff7584d416e6de5d3ade2da1ab17730331.tar.gz rust-0eff43ff7584d416e6de5d3ade2da1ab17730331.zip | |
Merge branch 'new-rustbuild' into rollup
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 2c2260a8e60..76bbb9d22e0 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -399,12 +399,10 @@ def main(): # Run the bootstrap args = [os.path.join(rb.build_dir, "bootstrap/debug/bootstrap")] - args.append('--src') - args.append(rb.rust_root) - args.append('--build') - args.append(rb.build) args.extend(sys.argv[1:]) env = os.environ.copy() + env["BUILD"] = rb.build + env["SRC"] = rb.rust_root env["BOOTSTRAP_PARENT_ID"] = str(os.getpid()) rb.run(args, env) |