From: bors <bors@rust-lang.org>
Date: Mon, 18 Dec 2017 19:30:28 +0000 (+0000)
Subject: Auto merge of #4818 - alexcrichton:rename-link-paths, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~92^2^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4bbfc70da98bc00edb5c0e04d32326b270753f2e;p=cargo.git

Auto merge of #4818 - alexcrichton:rename-link-paths, r=matklad

Fix renaming a project using build scripts

This commit fixes an issue in Cargo where if a project's folder was
renamed but it also contained a build script the project could break.
Cargo would continue to use the previous `rustc-link-search` arguments
to configure env vars like `LD_LIBRARY_PATH` but the literal values from
the previous compilation would be stale as the directories would no
longer be there.

To fix this when parsing the build script output we now retain a log of
the previous output directory of a build script invocation as well as
the current output, tweaking paths as appropriate if they were contained
in the output folder.

Closes #4053
---

4bbfc70da98bc00edb5c0e04d32326b270753f2e