diff options
| author | Jake Goulding <jake.goulding@gmail.com> | 2020-07-11 09:38:01 -0400 |
|---|---|---|
| committer | Jake Goulding <jake.goulding@gmail.com> | 2020-07-12 14:34:33 -0400 |
| commit | 9741fbd202b2b55de95abe1eb7f3d8185e312444 (patch) | |
| tree | dad7383a22008b4346f63e2329438209bea08d0e /src/bootstrap | |
| parent | 9d09331e00b02f81c714b0c41ce3a38380dd36a2 (diff) | |
| download | rust-9741fbd202b2b55de95abe1eb7f3d8185e312444.tar.gz rust-9741fbd202b2b55de95abe1eb7f3d8185e312444.zip | |
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.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/native.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index e8ec575ea37..ca0b3ddc920 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -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"); } |
