Skip to content

Commit

Permalink
Rollup merge of #77909 - pietroalbini:fix-build-manifest-path, r=Mark…
Browse files Browse the repository at this point in the history
…-Simulacrum

bootstrap: set correct path for the build-manifest binary

This changes the path of the binary inside the tarball to be:

```
build-manifest-{release}-{target}/build-manifest/bin/build-manifest
```

...instead of:

```
build-manifest-{release}-{target}/build-manifest/bin/build-manifest/build-manifest
```

r? @Mark-Simulacrum
  • Loading branch information
JohnTitor authored Oct 13, 2020
2 parents b24e25d + 6091538 commit b4a3b56
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2617,7 +2617,7 @@ impl Step for BuildManifest {
let image_bin = image.join("bin");
let _ = fs::remove_dir_all(&image);
t!(fs::create_dir_all(&image_bin));
builder.install(&build_manifest, &image_bin.join("build-manifest"), 0o755);
builder.install(&build_manifest, &image_bin, 0o755);

// Prepare the overlay.
let overlay = tmp.join("build-manifest-overlay");
Expand Down

0 comments on commit b4a3b56

Please sign in to comment.