Commit 5c9a37f

authored

Rollup merge of #144164 - ognevny:opt-dist-stage0-root, r=Kobzol

opt-dist: add an option for setting path to stage0 root in MSYS2 we have problems with stage0 for *-gnullvm hosts because prebuilt dist tarballs will be available starting from 1.90.0-beta. also this change helps to match bootstrap.toml config r? Kobzol try-job: dist-x86_64-msvc try-job: dist-x86_64-linux

2 parents cb3395b + fa92464 commit 5c9a37fCopy full SHA for 5c9a37f

File tree

2 files changed

+14

-8

lines changed

src/tools/opt-dist/src
- environment.rs
- main.rs

2 files changed

+14

-8

lines changed

`‎src/tools/opt-dist/src/environment.rs‎`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ pub struct Environment {`
`28`	`28`	`run_tests: bool,`
`29`	`29`	`fast_try_build: bool,`
`30`	`30`	`build_llvm: bool,`
	`31`	`+ #[builder(default)]`
	`32`	`+ stage0_root: Option<Utf8PathBuf>,`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`impl Environment {`
`@@ -56,17 +58,11 @@ impl Environment {`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`pub fn cargo_stage_0(&self) -> Utf8PathBuf {`
`59`		`- self.build_artifacts()`
`60`		`- .join("stage0")`
`61`		`- .join("bin")`
`62`		`- .join(format!("cargo{}", executable_extension()))`
	`61`	`+ self.stage0().join("bin").join(format!("cargo{}", executable_extension()))`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`pub fn rustc_stage_0(&self) -> Utf8PathBuf {`
`66`		`- self.build_artifacts()`
`67`		`- .join("stage0")`
`68`		`- .join("bin")`
`69`		`- .join(format!("rustc{}", executable_extension()))`
	`65`	`+ self.stage0().join("bin").join(format!("rustc{}", executable_extension()))`
`70`	`66`	`}`
`71`	`67`
`72`	`68`	`pub fn rustc_stage_2(&self) -> Utf8PathBuf {`
`@@ -116,6 +112,10 @@ impl Environment {`
`116`	`112`	`pub fn build_llvm(&self) -> bool {`
`117`	`113`	`self.build_llvm`
`118`	`114`	`}`
	`115`	`+`
	`116`	`+ pub fn stage0(&self) -> Utf8PathBuf {`
	`117`	`+ self.stage0_root.clone().unwrap_or_else(\|\| self.build_artifacts().join("stage0"))`
	`118`	`+ }`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`/// What is the extension of binary executables on this platform?`

`‎src/tools/opt-dist/src/main.rs‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,10 @@ enum EnvironmentCmd {`
`107`	`107`	/// in bootstrap.toml via `build.build-dir` option
`108`	`108`	`#[arg(long, default_value = "build")]`
`109`	`109`	`build_dir: Utf8PathBuf,`
	`110`	`+`
	`111`	`+ /// Path to custom stage0 root`
	`112`	`+ #[arg(long)]`
	`113`	`+ stage0_root: Option<Utf8PathBuf>,`
`110`	`114`	`},`
`111`	`115`	`/// Perform an optimized build on Linux CI, from inside Docker.`
`112`	`116`	`LinuxCi {`
`@@ -144,6 +148,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>`
`144`	`148`	`run_tests,`
`145`	`149`	`build_llvm,`
`146`	`150`	`build_dir,`
	`151`	`+ stage0_root,`
`147`	`152`	`} => {`
`148`	`153`	`let env = EnvironmentBuilder::default()`
`149`	`154`	`.host_tuple(target_triple)`
`@@ -160,6 +165,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>`
`160`	`165`	`.run_tests(run_tests)`
`161`	`166`	`.fast_try_build(is_fast_try_build)`
`162`	`167`	`.build_llvm(build_llvm)`
	`168`	`+ .stage0_root(stage0_root)`
`163`	`169`	`.build()?;`
`164`	`170`
`165`	`171`	`(env, shared.build_args)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5c9a37f

File tree

2 files changed

2 files changed

`‎src/tools/opt-dist/src/environment.rs‎`

`‎src/tools/opt-dist/src/main.rs‎`

0 commit comments