]> git.lizzy.rs Git - rust.git/commitdiff
Use "rust-installer tarball" to create rustc-src too
authorJosh Stone <jistone@redhat.com>
Mon, 8 May 2017 22:23:30 +0000 (15:23 -0700)
committerJosh Stone <jistone@redhat.com>
Mon, 15 May 2017 04:06:23 +0000 (21:06 -0700)
This gives us an extra rustc-src.tar.xz, which is 33% smaller than the .tar.gz!

src/bootstrap/dist.rs

index 028bfe3408f6dfc05589edf4cee70be36c492ae4..254b817b847a3a623e1478dce33f8f48e0f5ed4c 100644 (file)
@@ -469,13 +469,17 @@ pub fn rust_src(build: &Build) {
     write_file(&plain_dst_src.join("version"), build.rust_version().as_bytes());
 
     // Create plain source tarball
-    let tarball = rust_src_location(build);
+    let mut tarball = rust_src_location(build);
+    tarball.set_extension(""); // strip .gz
+    tarball.set_extension(""); // strip .tar
     if let Some(dir) = tarball.parent() {
         t!(fs::create_dir_all(dir));
     }
-    let mut cmd = Command::new("tar");
-    cmd.arg("-czf").arg(sanitize_sh(&tarball))
-       .arg(&plain_name)
+    let mut cmd = rust_installer(build);
+    cmd.arg("tarball")
+       .arg("--input").arg(&plain_name)
+       .arg("--output").arg(sanitize_sh(&tarball))
+       .arg("--work-dir=.")
        .current_dir(tmpdir(build));
     build.run(&mut cmd);