Auto merge of #133033 - klensy:win.dot, r= · rust-lang/rust@49ca183 (original) (raw)
`@@ -1870,7 +1870,7 @@ impl Step for Extended {
`
1870
1870
`.arg("-out")
`
1871
1871
`.arg(&output)
`
1872
1872
`.arg(input);
`
1873
``
`-
add_env(builder, &mut cmd, target);
`
``
1873
`+
add_env(builder, &mut cmd, target, &built_tools);
`
1874
1874
``
1875
1875
`if built_tools.contains("clippy") {
`
1876
1876
` cmd.arg("-dClippyDir=clippy");
`
`@@ -1974,7 +1974,14 @@ impl Step for Extended {
`
1974
1974
`}
`
1975
1975
`}
`
1976
1976
``
1977
``
`-
fn add_env(builder: &Builder<'_>, cmd: &mut BootstrapCommand, target: TargetSelection) {
`
``
1977
`+
fn add_env(
`
``
1978
`+
builder: &Builder<'_>,
`
``
1979
`+
cmd: &mut BootstrapCommand,
`
``
1980
`+
target: TargetSelection,
`
``
1981
`+
built_tools: &HashSet<&'static str>,
`
``
1982
`+
) {
`
``
1983
`+
// envs for wix should be always defined, even if not used
`
``
1984
`+
// FIXME: is they affect ccache?
`
1978
1985
`let mut parts = builder.version.split('.');
`
1979
1986
` cmd.env("CFG_RELEASE_INFO", builder.rust_version())
`
1980
1987
`.env("CFG_RELEASE_NUM", &builder.version)
`
`@@ -1995,6 +2002,27 @@ fn add_env(builder: &Builder<'_>, cmd: &mut BootstrapCommand, target: TargetSele
`
1995
2002
`} else {
`
1996
2003
` cmd.env("CFG_MINGW", "0").env("CFG_ABI", "MSVC");
`
1997
2004
`}
`
``
2005
+
``
2006
`+
if built_tools.contains("rustfmt") {
`
``
2007
`+
cmd.env("CFG_RUSTFMT", "1");
`
``
2008
`+
} else {
`
``
2009
`+
cmd.env("CFG_RUSTFMT", "0");
`
``
2010
`+
}
`
``
2011
`+
if built_tools.contains("clippy") {
`
``
2012
`+
cmd.env("CFG_CLIPPY", "1");
`
``
2013
`+
} else {
`
``
2014
`+
cmd.env("CFG_CLIPPY", "0");
`
``
2015
`+
}
`
``
2016
`+
if built_tools.contains("miri") {
`
``
2017
`+
cmd.env("CFG_MIRI", "1");
`
``
2018
`+
} else {
`
``
2019
`+
cmd.env("CFG_MIRI", "0");
`
``
2020
`+
}
`
``
2021
`+
if built_tools.contains("rust-analyzer") {
`
``
2022
`+
cmd.env("CFG_RA", "1");
`
``
2023
`+
} else {
`
``
2024
`+
cmd.env("CFG_RA", "0");
`
``
2025
`+
}
`
1998
2026
`}
`
1999
2027
``
2000
2028
`fn install_llvm_file(
`