submodules_names = []
for module in submodules:
if module.endswith("llvm-project"):
- if self.get_toml('llvm-config') and self.get_toml('lld') != 'true':
- continue
+ if self.get_toml('llvm-config') or self.get_toml('download-ci-llvm') == 'true':
+ if self.get_toml('lld') != 'true':
+ continue
check = self.check_submodule(module, slow_submodules)
filtered_submodules.append((module, check))
submodules_names.append(module)
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)
# 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
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
env["RUSTC_BOOTSTRAP"] = '1'
- env["CARGO"] = build.cargo()
- env["RUSTC"] = build.rustc()
if toml_path:
env["BOOTSTRAP_CONFIG"] = toml_path
- if build.rustfmt():
- env["RUSTFMT"] = build.rustfmt()
run(args, env=env, verbose=build.verbose)