Merge build_helper into util

2022-03-03 18:15:01 +01:00
parent 0cfc3e1016
commit e657da72aa
22 changed files with 166 additions and 182 deletions
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -118,12 +118,12 @@ use std::os::windows::fs::symlink_file;

 use filetime::FileTime;

-use crate::build_helper::{mtime, output, run, run_suppressed, t, try_run, try_run_suppressed};
 use crate::builder::Kind;
 use crate::config::{LlvmLibunwind, TargetSelection};
-use crate::util::{exe, libdir, CiEnv};
+use crate::util::{
+    exe, libdir, mtime, output, run, run_suppressed, t, try_run, try_run_suppressed, CiEnv,
+};

-mod build_helper;
 mod builder;
 mod cache;
 mod cc_detect;