diff options
| author | Matoro Mahri <matoro_gentoo@matoro.tk> | 2024-07-02 22:29:27 -0400 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-07-04 02:14:45 +0100 |
| commit | 7542c63f99687fafeff4fb5c972ef93a84f77db2 (patch) | |
| tree | c5bf22c42e1b200adcd8c94a86ad51bda5e5d091 /dev-lang/rust/files/1.79.0-revert-8c40426.patch | |
| parent | 0f160425d2a186a03386c6707e1e44a72baf5a53 (diff) | |
| download | gentoo-7542c63f99687fafeff4fb5c972ef93a84f77db2.tar.gz gentoo-7542c63f99687fafeff4fb5c972ef93a84f77db2.tar.bz2 gentoo-7542c63f99687fafeff4fb5c972ef93a84f77db2.zip | |
dev-lang/rust: add patch to disable setting CMAKE_ASM_COMPILER
This is apparently not (or no longer) consumed by the bundled LLVM,
which makes our QA complain.
See: https://github.com/rust-lang/rust/commit/8c40426051a667673cdac9975f84cb6acd4e245f
Closes: https://bugs.gentoo.org/933382
Signed-off-by: Matoro Mahri <matoro_gentoo@matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/37405
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang/rust/files/1.79.0-revert-8c40426.patch')
| -rw-r--r-- | dev-lang/rust/files/1.79.0-revert-8c40426.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/dev-lang/rust/files/1.79.0-revert-8c40426.patch b/dev-lang/rust/files/1.79.0-revert-8c40426.patch new file mode 100644 index 000000000000..583f4001c9cb --- /dev/null +++ b/dev-lang/rust/files/1.79.0-revert-8c40426.patch @@ -0,0 +1,18 @@ +This reverts commit 8c40426051a667673cdac9975f84cb6acd4e245f. + +https://bugs.gentoo.org/933382 + +diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs +index d4473e24039..58f351d17fa 100644 +--- a/src/bootstrap/src/core/build_steps/llvm.rs ++++ b/src/bootstrap/src/core/build_steps/llvm.rs +@@ -724,8 +724,7 @@ fn configure_cmake( + } + } + cfg.define("CMAKE_C_COMPILER", sanitize_cc(&cc)) +- .define("CMAKE_CXX_COMPILER", sanitize_cc(&cxx)) +- .define("CMAKE_ASM_COMPILER", sanitize_cc(&cc)); ++ .define("CMAKE_CXX_COMPILER", sanitize_cc(&cxx)); + } + + cfg.build_arg("-j").build_arg(builder.jobs().to_string()); |