diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-09-06 21:32:55 -0400 | 
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-09-20 16:18:58 -0400 | 
| commit | e21eb613e09a0ecb4eaa141712a389d05c40ffad (patch) | |
| tree | 98ad13e19f82be3af5f43fb10ca64abfdf0b7e61 /src/bootstrap/bootstrap.py | |
| parent | 6d195615872440798ac47ad7a4d8fd090fcbc24a (diff) | |
| download | rust-e21eb613e09a0ecb4eaa141712a389d05c40ffad.tar.gz rust-e21eb613e09a0ecb4eaa141712a389d05c40ffad.zip | |
Remove support for different src directory
This requires that bootstrap is run from the same worktree as the sources it'll build, but this is basically required for the build to work anyway. You can still run it from a different directory, just that the files it builds must be beside it.
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 4 | 
1 files changed, 1 insertions, 3 deletions
| diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index c9a9a484ee3..c8cb2595d32 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -966,7 +966,6 @@ def bootstrap(help_triggered): parser = argparse.ArgumentParser(description='Build rust') parser.add_argument('--config') parser.add_argument('--build') - parser.add_argument('--src') parser.add_argument('--clean', action='store_true') parser.add_argument('-v', '--verbose', action='count', default=0) @@ -975,7 +974,7 @@ def bootstrap(help_triggered): # Configure initial bootstrap build = RustBuild() - build.rust_root = args.src or os.path.abspath(os.path.join(__file__, '../../..')) + build.rust_root = os.path.abspath(os.path.join(__file__, '../../..')) build.verbose = args.verbose build.clean = args.clean @@ -1032,7 +1031,6 @@ def bootstrap(help_triggered): args = [build.bootstrap_binary()] args.extend(sys.argv[1:]) env = os.environ.copy() - env["SRC"] = build.rust_root env["BOOTSTRAP_PARENT_ID"] = str(os.getpid()) env["BOOTSTRAP_PYTHON"] = sys.executable env["BUILD_DIR"] = build.build_dir | 
