try hooking up a different env

Author: mati865

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -3415,7 +3415,7 @@ fn add_wild_args(
     self_contained_components: LinkSelfContainedComponents,
 ) {
     // Either Wild or LLD to make it work with CI
-    if flavor != LinkerFlavor::Wild || std::env::var_os("BUILDING_RUSTC").is_some() {
+    if flavor != LinkerFlavor::Wild || std::env::var_os("CI_JOB_NAME").is_some() {
         let self_contained_cli = sess.opts.cg.link_self_contained.is_linker_enabled();
         let self_contained_target = self_contained_components.is_linker_enabled();
 

src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

@@ -112,8 +112,6 @@ ENV LIBCURL_NO_PKG_CONFIG 1
 
 ENV DIST_REQUIRE_ALL_TOOLS 1
 
-ENV BUILDING_RUSTC 1
-
 # FIXME: Without this, LLVMgold.so incorrectly resolves to the system
 # libstdc++, instead of the one we build.
 ENV LD_PRELOAD=/rustroot/lib64/libstdc++.so.6