diff options
| author | bors <bors@rust-lang.org> | 2017-01-30 19:43:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-30 19:43:08 +0000 |
| commit | 892170765387ca7bd332900efecf6ec7dc5df700 (patch) | |
| tree | 8e86151e1a97221f8fe240e32e6406f762c963fc /src | |
| parent | 55f9712d14126bce39357e6160a638ce7886e982 (diff) | |
| parent | 45d203df302d1a4b684ffec07edc4ec7fd1fa36d (diff) | |
| download | rust-892170765387ca7bd332900efecf6ec7dc5df700.tar.gz rust-892170765387ca7bd332900efecf6ec7dc5df700.zip | |
Auto merge of #39368 - alexcrichton:fix-upload-dirs, r=aturon
travis: Tweak artifact uploads * Don't upload `*.wixpdb` files by accident * Don't upload `doc` dir by accident * Fix level of indirection on Travis
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/dist.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 71a5f313bbd..5fac142f777 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -827,7 +827,7 @@ pub fn extended(build: &Build, stage: u32, target: &str) { cmd.arg("-nologo") .arg("-ext").arg("WixUIExtension") .arg("-ext").arg("WixUtilExtension") - .arg("-out").arg(distdir(build).join(filename)) + .arg("-out").arg(exe.join(&filename)) .arg("rust.wixobj") .arg("ui.wixobj") .arg("rustwelcomedlg.wixobj") @@ -844,6 +844,8 @@ pub fn extended(build: &Build, stage: u32, target: &str) { cmd.arg("-sice:ICE57"); build.run(&mut cmd); + + t!(fs::rename(exe.join(&filename), distdir(build).join(&filename))); } } |