diff mbox series

[V2,2/3] rust: Fix build break because of download-ci-llvm

Message ID 20250303153458.2879205-2-Deepesh.Varatharajan@windriver.com
State Accepted, archived
Commit d43424cba7e93ee30b410d0a024be441e2336dbd
Headers show
Series [V2,1/3] rust: Upgrade 1.82.0->1.83.0 | expand

Commit Message

Deepesh Varatharajan March 3, 2025, 3:34 p.m. UTC 
From: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>

-----------------------------------------------------------------------
| thread 'main' panicked at src/core/config/config.rs:2047:13:
| setting build-target.llvm-config is incompatible with download-ci-llvm.
-----------------------------------------------------------------------

Disable the automatic download of pre-built LLVM binaries, ensuring
compatibility with local LLVM builds and preventing conflicts with other
configuration settings.

Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
---
 meta/recipes-devtools/rust/rust_1.83.0.bb | 1 +
 1 file changed, 1 insertion(+)

Comments

Deepesh Varatharajan March 4, 2025, 10:34 a.m. UTC | #1 
On 03-03-2025 21:04, Deepesh.Varatharajan@windriver.com wrote:
> From: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
>
> -----------------------------------------------------------------------
> | thread 'main' panicked at src/core/config/config.rs:2047:13:
> | setting build-target.llvm-config is incompatible with download-ci-llvm.
> -----------------------------------------------------------------------
>
> Disable the automatic download of pre-built LLVM binaries, ensuring
> compatibility with local LLVM builds and preventing conflicts with other
> configuration settings.
>
> Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
> ---
>   meta/recipes-devtools/rust/rust_1.83.0.bb | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb
> index 2bf87ba27e..ffbac267b6 100644
> --- a/meta/recipes-devtools/rust/rust_1.83.0.bb
> +++ b/meta/recipes-devtools/rust/rust_1.83.0.bb
> @@ -129,6 +129,7 @@ python do_configure() {
>       # [llvm]
>       config.add_section("llvm")
>       config.set("llvm", "static-libstdcpp", e(False))
> +    config.set("llvm", "download-ci-llvm", e(False))
>       if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""):
>           config.set("llvm", "use-libcxx", e(True))
>   
Hi All,

Previously, download-ci-llvm was set to false. However, with the 
following commit:
https://github.com/rust-lang/rust/commit/7d579046c80d3de3143dcb8b2db5640f95b5383c 
, which has been present from rust_1.83,
it was changed to true. As a result, after updating to rust_1.83, we 
encountered the following error during the build:

--------------------------------------------------------------------------------------------------------------------
| thread 'main' panicked at src/core/config/config.rs:2047:13:
| setting build-target.llvm-config is incompatible with download-ci-llvm.
| note: run with `RUST_BACKTRACE=1` environment variable to display a 
backtrace
--------------------------------------------------------------------------------------------------------------------

To resolve this issue, we are setting download-ci-llvm back to false.

If no other issues seen in the AB , we will send a V3 with an 
explanatory commit message.


Regards,
Deepesh
Richard Purdie March 4, 2025, 11:07 a.m. UTC | #2 
On Tue, 2025-03-04 at 16:04 +0530, Varatharajan, Deepesh via lists.openembedded.org wrote:
> 
> On 03-03-2025 21:04, Deepesh.Varatharajan@windriver.com wrote:
> > From: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
> > 
> > -----------------------------------------------------------------------
> > > thread 'main' panicked at src/core/config/config.rs:2047:13:
> > > setting build-target.llvm-config is incompatible with download-ci-llvm.
> > -----------------------------------------------------------------------
> > 
> > Disable the automatic download of pre-built LLVM binaries, ensuring
> > compatibility with local LLVM builds and preventing conflicts with other
> > configuration settings.
> > 
> > Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
> > ---
> >   meta/recipes-devtools/rust/rust_1.83.0.bb | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb
> > index 2bf87ba27e..ffbac267b6 100644
> > --- a/meta/recipes-devtools/rust/rust_1.83.0.bb
> > +++ b/meta/recipes-devtools/rust/rust_1.83.0.bb
> > @@ -129,6 +129,7 @@ python do_configure() {
> >       # [llvm]
> >       config.add_section("llvm")
> >       config.set("llvm", "static-libstdcpp", e(False))
> > +    config.set("llvm", "download-ci-llvm", e(False))
> >       if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""):
> >           config.set("llvm", "use-libcxx", e(True))
> >   
> Hi All,
> 
> Previously, download-ci-llvm was set to false. However, with the 
> following commit:
> https://github.com/rust-lang/rust/commit/7d579046c80d3de3143dcb8b2db5640f95b5383c 
> , which has been present from rust_1.83,
> it was changed to true. As a result, after updating to rust_1.83, we 
> encountered the following error during the build:
> 
> --------------------------------------------------------------------------------------------------------------------
> > thread 'main' panicked at src/core/config/config.rs:2047:13:
> > setting build-target.llvm-config is incompatible with download-ci-llvm.
> > note: run with `RUST_BACKTRACE=1` environment variable to display a
> backtrace
> --------------------------------------------------------------------------------------------------------------------
> 
> To resolve this issue, we are setting download-ci-llvm back to false.
> 
> If no other issues seen in the AB , we will send a V3 with an 
> explanatory commit message.

Nothing was seen in testing so far so the series is looking ready to
merge. How was the previous world build failure from v1 fixed out of
interest?

Thanks,

Richard
Deepesh Varatharajan March 4, 2025, 12:07 p.m. UTC | #3 
On 04-03-2025 16:37, Richard Purdie wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Tue, 2025-03-04 at 16:04 +0530, Varatharajan, Deepesh via lists.openembedded.org wrote:
>> On 03-03-2025 21:04, Deepesh.Varatharajan@windriver.com wrote:
>>> From: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
>>>
>>> -----------------------------------------------------------------------
>>>> thread 'main' panicked at src/core/config/config.rs:2047:13:
>>>> setting build-target.llvm-config is incompatible with download-ci-llvm.
>>> -----------------------------------------------------------------------
>>>
>>> Disable the automatic download of pre-built LLVM binaries, ensuring
>>> compatibility with local LLVM builds and preventing conflicts with other
>>> configuration settings.
>>>
>>> Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
>>> ---
>>>    meta/recipes-devtools/rust/rust_1.83.0.bb | 1 +
>>>    1 file changed, 1 insertion(+)
>>>
>>> diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb
>>> index 2bf87ba27e..ffbac267b6 100644
>>> --- a/meta/recipes-devtools/rust/rust_1.83.0.bb
>>> +++ b/meta/recipes-devtools/rust/rust_1.83.0.bb
>>> @@ -129,6 +129,7 @@ python do_configure() {
>>>        # [llvm]
>>>        config.add_section("llvm")
>>>        config.set("llvm", "static-libstdcpp", e(False))
>>> +    config.set("llvm", "download-ci-llvm", e(False))
>>>        if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""):
>>>            config.set("llvm", "use-libcxx", e(True))
>>>
>> Hi All,
>>
>> Previously, download-ci-llvm was set to false. However, with the
>> following commit:
>> https://github.com/rust-lang/rust/commit/7d579046c80d3de3143dcb8b2db5640f95b5383c
>> , which has been present from rust_1.83,
>> it was changed to true. As a result, after updating to rust_1.83, we
>> encountered the following error during the build:
>>
>> --------------------------------------------------------------------------------------------------------------------
>>> thread 'main' panicked at src/core/config/config.rs:2047:13:
>>> setting build-target.llvm-config is incompatible with download-ci-llvm.
>>> note: run with `RUST_BACKTRACE=1` environment variable to display a
>> backtrace
>> --------------------------------------------------------------------------------------------------------------------
>>
>> To resolve this issue, we are setting download-ci-llvm back to false.
>>
>> If no other issues seen in the AB , we will send a V3 with an
>> explanatory commit message.
> Nothing was seen in testing so far so the series is looking ready to
> merge. How was the previous world build failure from v1 fixed out of
> interest?
>
> Thanks,
>
> Richard
The issue which was seen in AB is because of the following commit 
https://github.com/rust-lang/rust/pull/131372/commits/68034f837a39387e49fc7d7c5b088f5372a1127e 
,

When building Rust for a 64-bit architecture with lib32 enabled, the 
patch incorrectly prevents the addition of the -Zdual-proc-macros flag. 
This occurs because the check introduced by the patch detects an issue 
with proc macro support. The issue might stem from the 
-Zdual-proc-macros flag not functioning properly when lib32 is enabled 
in the build environment. As a result, the build fails when lib32 is 
enabled, but the issue does not occur when lib32 is disabled for 64-bit 
architectures. Hence for now, we reverted this patch.

Reverting this patch will restore the previous behavior, where the 
-Zdual-proc-macros flag is always added for building proc macros, 
regardless of the target architecture's support. This would bypass the 
check introduced in the patch, allowing the build to proceed without 
error, even when building for a 64-bit architecture with lib32 enabled.

Regards,
Deepesh
diff mbox series

Patch

diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb
index 2bf87ba27e..ffbac267b6 100644
--- a/meta/recipes-devtools/rust/rust_1.83.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.83.0.bb
@@ -129,6 +129,7 @@  python do_configure() {
     # [llvm]
     config.add_section("llvm")
     config.set("llvm", "static-libstdcpp", e(False))
+    config.set("llvm", "download-ci-llvm", e(False))
     if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""):
         config.set("llvm", "use-libcxx", e(True))