Changeset View
Changeset View
Standalone View
Standalone View
head/lang/rust/files/patch-src_bootstrap_native.rs
| From 9741fbd202b2b55de95abe1eb7f3d8185e312444 Mon Sep 17 00:00:00 2001 | There seems to be some kind of race when using llvm-config-wrapper | ||||
| From: Jake Goulding <jake.goulding@gmail.com> | for building rust-lld. Attempt to improve reliability of the build | ||||
| Date: Sat, 11 Jul 2020 09:38:01 -0400 | by not using it. llvm-config-wrapper is a hack in the first place | ||||
| Subject: [PATCH] Don't allow `DESTDIR` to influence LLVM builds | that is only really needed on Windows. | ||||
| 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. | |||||
| --- | |||||
| src/bootstrap/native.rs | 5 +++++ | |||||
| 1 file changed, 5 insertions(+) | |||||
| --- src/bootstrap/native.rs.orig 2020-08-24 15:00:49 UTC | --- src/bootstrap/native.rs.orig 2020-08-24 15:00:49 UTC | ||||
| +++ src/bootstrap/native.rs | +++ src/bootstrap/native.rs | ||||
| @@ -517,26 +522,9 @@ impl Step for Lld { | @@ -517,26 +522,9 @@ impl Step for Lld { | ||||
| let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld")); | let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld")); | ||||
| configure_cmake(builder, target, &mut cfg, true); | configure_cmake(builder, target, &mut cfg, true); | ||||
| - // This is an awful, awful hack. Discovered when we migrated to using | - // This is an awful, awful hack. Discovered when we migrated to using | ||||
| Show All 23 Lines | |||||