sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lang/rust*: Bring back the llvm-config-wrapper patches after r543251

Browse source 
Apparently they are still needed:
http://gohan03.nyi.freebsd.org/data/head-amd64-default-baseline/p543836_s363720/logs/errors/rust-1.45.1.log
http://gohan03.nyi.freebsd.org/data/head-amd64-default-baseline/p543836_s363720/logs/errors/rust-nightly-1.47.0.20200724.log
http://gohan03.nyi.freebsd.org/data/head-amd64-default-baseline/p544005_s363784/logs/errors/rust-1.45.1.log

Reported by:	antoine
This commit is contained in:
Tobias Kortkamp 2020-08-05 14:46:18 +00:00
parent de0521e608
commit 1c843dbb6a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=544224
2 changed files with 63 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lang/rust-nightly/files/patch-src_bootstrap_native.rs Normal file
View file

@ -0,0 +1,35 @@
There seems to be some kind of race when using llvm-config-wrapper
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-07-17 17:26:27 UTC
+++ src/bootstrap/native.rs
@@ -542,26 +542,9 @@ impl Step for Lld {
let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld"));
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
- // tree, will execute `llvm-config --cmakedir` and then tell CMake about
- // that directory for later processing. Unfortunately if this path has
- // forward slashes in it (which it basically always does on Windows)
- // then CMake will hit a syntax error later on as... something isn't
- // escaped it seems?
- //
- // Instead of attempting to fix this problem in upstream CMake and/or
- // LLVM/LLD we just hack around it here. This thin wrapper will take the
- // output from llvm-config and replace all instances of `\` with `/` to
- // 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");
-
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");
// While we're using this horrible workaround to shim the execution of

29
lang/rust/files/patch-src_bootstrap_native.rs
View file

@ -11,7 +11,7 @@ to *use* those LLVM files.
src/bootstrap/native.rs | 5 +++++
1 file changed, 5 insertions(+)
--- src/bootstrap/native.rs.orig 2020-07-26 16:11:04 UTC
--- src/bootstrap/native.rs.orig 2020-07-31 20:16:28 UTC
+++ src/bootstrap/native.rs
@@ -324,6 +324,11 @@ fn configure_cmake(
// LLVM and LLD builds can produce a lot of those and hit CI limits on log size.
@ -25,3 +25,30 @@ to *use* those LLVM files.
if builder.config.ninja {
cfg.generator("Ninja");
}
@@ -480,25 +485,9 @@ impl Step for Lld {
let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld"));
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
- // tree, will execute `llvm-config --cmakedir` and then tell CMake about
- // that directory for later processing. Unfortunately if this path has
- // forward slashes in it (which it basically always does on Windows)
- // then CMake will hit a syntax error later on as... something isn't
- // escaped it seems?
- //
- // Instead of attempting to fix this problem in upstream CMake and/or
- // LLVM/LLD we just hack around it here. This thin wrapper will take the
- // output from llvm-config and replace all instances of `\` with `/` to
- // 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");
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");
// While we're using this horrible workaround to shim the execution of