Support building with "cargo" directly instead of "x.py" for development purposes

Cargo.lock

@@ -19,6 +19,7 @@ dependencies = [
 name = "alloc"
 version = "0.0.0"
 dependencies = [
+ "build_helper",
  "compiler_builtins",
  "core",
  "rand 0.7.3",
@@ -653,6 +654,7 @@ dependencies = [
 name = "core"
 version = "0.0.0"
 dependencies = [
+ "build_helper",
  "rand 0.7.3",
 ]
 
@@ -3694,6 +3696,7 @@ dependencies = [
  "indexmap",
  "jobserver",
  "lazy_static 1.4.0",
+ "libc",
  "log",
  "measureme",
  "parking_lot 0.10.0",
@@ -3713,6 +3716,7 @@ version = "0.0.0"
 dependencies = [
  "env_logger 0.7.1",
  "lazy_static 1.4.0",
+ "libc",
  "log",
  "rustc_ast",
  "rustc_ast_pretty",
@@ -3867,6 +3871,7 @@ dependencies = [
 name = "rustc_interface"
 version = "0.0.0"
 dependencies = [
+ "libc",
  "log",
  "once_cell",
  "rustc-rayon",
@@ -3960,6 +3965,7 @@ name = "rustc_metadata"
 version = "0.0.0"
 dependencies = [
  "flate2",
+ "libc",
  "log",
  "memmap",
  "rustc_ast",
@@ -4197,6 +4203,8 @@ dependencies = [
 name = "rustc_session"
 version = "0.0.0"
 dependencies = [
+ "build_helper",
+ "getopts",
  "log",
  "num_cpus",
  "rustc_ast",
@@ -4689,6 +4697,7 @@ version = "0.0.0"
 dependencies = [
  "alloc",
  "backtrace",
+ "build_helper",
  "cfg-if",
  "compiler_builtins",
  "core",

src/bootstrap/compile.rs

@@ -461,6 +461,7 @@ impl Step for Rustc {
 
 pub fn rustc_cargo(builder: &Builder<'_>, cargo: &mut Cargo, target: Interned<String>) {
     cargo
+        .arg("--no-default-features")
         .arg("--features")
         .arg(builder.rustc_features())
         .arg("--manifest-path")

src/bootstrap/dist.rs

@@ -1174,7 +1174,7 @@ impl Step for Cargo {
         let etc = src.join("src/etc");
         let release_num = builder.release_num("cargo");
         let name = pkgname(builder, "cargo");
-        let version = builder.cargo_info.version(builder, &release_num);
+        let version = builder.cargo_info.version(builder.release(&release_num));
 
         let tmp = tmpdir(builder);
         let image = tmp.join("cargo-image");
@@ -1266,7 +1266,7 @@ impl Step for Rls {
         let src = builder.src.join("src/tools/rls");
         let release_num = builder.release_num("rls");
         let name = pkgname(builder, "rls");
-        let version = builder.rls_info.version(builder, &release_num);
+        let version = builder.rls_info.version(builder.release(&release_num));
 
         let tmp = tmpdir(builder);
         let image = tmp.join("rls-image");
@@ -1356,7 +1356,7 @@ impl Step for Clippy {
         let src = builder.src.join("src/tools/clippy");
         let release_num = builder.release_num("clippy");
         let name = pkgname(builder, "clippy");
-        let version = builder.clippy_info.version(builder, &release_num);
+        let version = builder.clippy_info.version(builder.release(&release_num));
 
         let tmp = tmpdir(builder);
         let image = tmp.join("clippy-image");
@@ -1453,7 +1453,7 @@ impl Step for Miri {
         let src = builder.src.join("src/tools/miri");
         let release_num = builder.release_num("miri");
         let name = pkgname(builder, "miri");
-        let version = builder.miri_info.version(builder, &release_num);
+        let version = builder.miri_info.version(builder.release(&release_num));
 
         let tmp = tmpdir(builder);
         let image = tmp.join("miri-image");
@@ -1549,7 +1549,7 @@ impl Step for Rustfmt {
         let src = builder.src.join("src/tools/rustfmt");
         let release_num = builder.release_num("rustfmt");
         let name = pkgname(builder, "rustfmt");
-        let version = builder.rustfmt_info.version(builder, &release_num);
+        let version = builder.rustfmt_info.version(builder.release(&release_num));
 
         let tmp = tmpdir(builder);
         let image = tmp.join("rustfmt-image");

src/bootstrap/lib.rs

@@ -120,15 +120,14 @@ use std::os::unix::fs::symlink as symlink_file;
 #[cfg(windows)]
 use std::os::windows::fs::symlink_file;
 
-use build_helper::{mtime, output, run, run_suppressed, t, try_run, try_run_suppressed};
+use build_helper::{channel, mtime, output, run, run_suppressed, t, try_run, try_run_suppressed};
 use filetime::FileTime;
 
 use crate::util::{exe, libdir, CiEnv};
 
 mod builder;
 mod cache;
 mod cc_detect;
-mod channel;
 mod check;
 mod clean;
 mod compile;
@@ -1047,7 +1046,7 @@ impl Build {
     /// Note that this is a descriptive string which includes the commit date,
     /// sha, version, etc.
     fn rust_version(&self) -> String {
-        self.rust_info.version(self, channel::CFG_RELEASE_NUM)
+        self.rust_info.version(self.release(channel::CFG_RELEASE_NUM))
     }
 
     /// Returns the full commit hash.

src/bootstrap/channel.rs → src/build_helper/channel.rs

@@ -8,17 +8,17 @@
 use std::path::Path;
 use std::process::Command;
 
-use build_helper::output;
-
-use crate::Build;
+use crate::output;
 
 // The version number
 pub const CFG_RELEASE_NUM: &str = "1.44.0";
 
+#[derive(Clone)]
 pub struct GitInfo {
     inner: Option<Info>,
 }
 
+#[derive(Clone)]
 struct Info {
     commit_date: String,
     sha: String,
@@ -72,8 +72,7 @@ impl GitInfo {
         self.inner.as_ref().map(|s| &s.commit_date[..])
     }
 
-    pub fn version(&self, build: &Build, num: &str) -> String {
-        let mut version = build.release(num);
+    pub fn version(&self, mut version: String) -> String {
         if let Some(ref inner) = self.inner {
             version.push_str(" (");
             version.push_str(&inner.short_sha);