diff options
Diffstat (limited to 'lang/rust/files/patch-src_bootstrap_native.rs')
| -rw-r--r-- | lang/rust/files/patch-src_bootstrap_native.rs | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lang/rust/files/patch-src_bootstrap_native.rs b/lang/rust/files/patch-src_bootstrap_native.rs index b160c5fa94b2..433833a4a5af 100644 --- a/lang/rust/files/patch-src_bootstrap_native.rs +++ b/lang/rust/files/patch-src_bootstrap_native.rs @@ -3,11 +3,11 @@ for building rust-lld. Attempt to improve reliability of the build by not using it. llvm-config-wrapper is a hack in the first place that is only really needed on Windows. ---- src/bootstrap/native.rs.orig 2020-03-01 09:54:42 UTC +--- src/bootstrap/native.rs.orig 2020-02-27 18:39:49 UTC +++ src/bootstrap/native.rs -@@ -472,27 +472,9 @@ impl Step for Lld { +@@ -467,25 +467,9 @@ impl Step for Lld { let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld")); - configure_cmake(builder, target, &mut cfg); + configure_cmake(builder, target, &mut cfg, true); - // This is an awful, awful hack. Discovered when we migrated to using - // clang-cl to compile LLVM/LLD it turns out that LLD, when built out of @@ -23,14 +23,12 @@ that is only really needed on Windows. - // ensure we don't hit the same bugs with escaping. It means that you - // can't build on a system where your paths require `\` on Windows, but - // there's probably a lot of reasons you can't do that other than this. -- let llvm_config_shim = env::current_exe() -- .unwrap() -- .with_file_name("llvm-config-wrapper"); +- let llvm_config_shim = env::current_exe().unwrap().with_file_name("llvm-config-wrapper"); cfg.out_dir(&out_dir) - .profile("Release") -- .env("LLVM_CONFIG_REAL", llvm_config) -- .define("LLVM_CONFIG_PATH", llvm_config_shim) -+ .define("LLVM_CONFIG_PATH", llvm_config) - .define("LLVM_INCLUDE_TESTS", "OFF"); + .profile("Release") +- .env("LLVM_CONFIG_REAL", llvm_config) +- .define("LLVM_CONFIG_PATH", llvm_config_shim) ++ .define("LLVM_CONFIG_PATH", llvm_config) + .define("LLVM_INCLUDE_TESTS", "OFF"); cfg.build(); |