mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #77909 - pietroalbini:fix-build-manifest-path, r=Mark-Simulacrum

Browse Source 
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
This commit is contained in:
Yuki Okushi 2020-10-14 06:02:41 +09:00 committed by GitHub
commit b4a3b5617f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/dist.rs
View File

@ -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");