Date: Fri, 17 Mar 2023 08:19:54 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d050a1c356a5 - main - lang/rust: garbage collect patch Message-ID: <202303170819.32H8JsZa052807@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=d050a1c356a566137b1d5c6f74772788a6d08779 commit d050a1c356a566137b1d5c6f74772788a6d08779 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2023-03-17 08:18:49 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2023-03-17 08:19:51 +0000 lang/rust: garbage collect patch PR: 270271 --- .../no-hardlinks/patch-src_bootstrap_native.rs | 40 ---------------------- 1 file changed, 40 deletions(-) diff --git a/lang/rust/files/no-hardlinks/patch-src_bootstrap_native.rs b/lang/rust/files/no-hardlinks/patch-src_bootstrap_native.rs deleted file mode 100644 index 2e4a03cd315c..000000000000 --- a/lang/rust/files/no-hardlinks/patch-src_bootstrap_native.rs +++ /dev/null @@ -1,40 +0,0 @@ -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-08-24 15:00:49 UTC -+++ src/bootstrap/native.rs -@@ -634,22 +634,6 @@ impl Step for Lld { - let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld")); - configure_cmake(builder, target, &mut cfg, true, LdFlags::default()); - -- // 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"); -- - // Re-use the same flags as llvm to control the level of debug information - // generated for lld. - let profile = match (builder.config.llvm_optimize, builder.config.llvm_release_debuginfo) { -@@ -660,8 +644,7 @@ impl Step for Lld { - - cfg.out_dir(&out_dir) - .profile(profile) -- .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303170819.32H8JsZa052807>