Rollup merge of #106328 - GuillaumeGomez:gui-test-explanation, r=notriddle

[rust.git] / src / bootstrap / native.rs

diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index bdc81b07b8d546c36b887920261bc9e092fe5323..4e503dfe864e2937eca0461125effb8147739ff1 100644 (file)
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -24,8 +24,6 @@
 use crate::util::{self, exe, output, t, up_to_date};
 use crate::{CLang, GitRepo};
 
-use build_helper::ci::CiEnv;
-
 #[derive(Clone)]
 pub struct LlvmResult {
     /// Path to llvm-config binary.
@@ -219,7 +217,7 @@ pub(crate) fn is_ci_llvm_available(config: &Config, asserts: bool) -> bool {
         return false;
     }
 
-    if CiEnv::is_ci() {
+    if crate::util::CiEnv::is_ci() {
         // We assume we have access to git, so it's okay to unconditionally pass
         // `true` here.
         let llvm_sha = detect_llvm_sha(config, true);