Skip to content

Commit

Permalink
Rollup merge of #74252 - shepmaster:bootstrap-rust-destdir, r=Mark-Si…
Browse files Browse the repository at this point in the history
…mulacrum

Don't allow `DESTDIR` to influence LLVM builds

When running a command like `DESTDIR=foo x.py install` in a completely
clean build directory, this will cause LLVM to be installed into
`DESTDIR`, which then causes the build to fail later when it attempts
to *use* those LLVM files.
  • Loading branch information
Manishearth committed Jul 14, 2020
2 parents a364c0a + 9741fbd commit 1e74f28
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,11 @@ fn configure_cmake(
// LLVM and LLD builds can produce a lot of those and hit CI limits on log size.
cfg.define("CMAKE_INSTALL_MESSAGE", "LAZY");

// Do not allow the user's value of DESTDIR to influence where
// LLVM will install itself. LLVM must always be installed in our
// own build directories.
cfg.env("DESTDIR", "");

if builder.config.ninja {
cfg.generator("Ninja");
}
Expand Down

0 comments on commit 1e74f28

Please sign in to comment.