Rollup merge of rust-lang#94082 - bjorn3:remove_cfg_platform, r=Mark-Simulacrum

matthiaskrgr · web-flow · commit e1bf0694820f · 2022-02-17T23:01:02.000+01:00
Remove CFG_PLATFORM

It seems to be unused and it is incorrect for arm/aarch64 anyway.
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -1877,12 +1877,6 @@ fn add_env(builder: &Builder<'_>, cmd: &mut Command, target: TargetSelection) {
     } else {
         cmd.env("CFG_MINGW", "0").env("CFG_ABI", "MSVC");
     }
-
-    if target.contains("x86_64") {
-        cmd.env("CFG_PLATFORM", "x64");
-    } else {
-        cmd.env("CFG_PLATFORM", "x86");
-    }
 }
 
 /// Maybe add LLVM object files to the given destination lib-dir. Allows either static or dynamic linking.

Original file line number	Diff line number	Diff line change
`@@ -1877,12 +1877,6 @@ fn add_env(builder: &Builder<'_>, cmd: &mut Command, target: TargetSelection) {`
`1877`	`1877`	`} else {`
`1878`	`1878`	`cmd.env("CFG_MINGW", "0").env("CFG_ABI", "MSVC");`
`1879`	`1879`	`}`
`1880`		`-`
`1881`		`- if target.contains("x86_64") {`
`1882`		`- cmd.env("CFG_PLATFORM", "x64");`
`1883`		`- } else {`
`1884`		`- cmd.env("CFG_PLATFORM", "x86");`
`1885`		`- }`
`1886`	`1880`	`}`
`1887`	`1881`
`1888`	`1882`	`/// Maybe add LLVM object files to the given destination lib-dir. Allows either static or dynamic linking.`