Skip to content

Fix official build of cross DAC components#86138

Merged
jkotas merged 9 commits intodotnet:mainfrom
jkotas:official-build
May 12, 2023
Merged

Fix official build of cross DAC components#86138
jkotas merged 9 commits intodotnet:mainfrom
jkotas:official-build

Conversation

@jkotas
Copy link
Member

@jkotas jkotas commented May 12, 2023

Revert changes that broke build of the cross DAC linux-arm components

Fixes #86073

Revert changes that broke build of the cross DAC linux-arm components

Fixes dotnet#86073
@ghost ghost assigned jkotas May 12, 2023
@jkotas jkotas requested a review from BruceForstall May 12, 2023 07:05
@ghost
Copy link

ghost commented May 12, 2023

Tagging subscribers to this area: @hoyosjs
See info in area-owners.md if you want to be subscribed.

Issue Details

Revert changes that broke build of the cross DAC linux-arm components

Fixes #86073

Author: jkotas
Assignees: -
Labels:

area-Infrastructure-coreclr

Milestone: -

- script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -hostarch x64 $(osArg) -ci $(compilerArg) -component crosscomponents -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" $(officialBuildIdArg) $(clrRuntimePortableBuildArg)
displayName: Build CoreCLR Cross-Arch Tools (Tools that run on x64 targeting x86)

- ${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.archType, 'x86')) }}:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is reverting https://github.com/dotnet/runtime/pull/85947/files#diff-0605564a3ca1b4b1eca0cc0450b7628c0d027841259052a35825bd2e035484dfL205-L207 with a slight modification: We used to build the linux-arm targeting DAC in Windows arm build that is gone. We build it in Windows x86 build now.


set __TargetArchX64=0
set __TargetArchX86=0
set __TargetArchArm=0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arm argument is necessary to specify linux-arm.

@ghost ghost added the needs-author-action An issue or pull request that requires more info or actions from the author. label May 12, 2023
@ghost ghost removed the needs-author-action An issue or pull request that requires more info or actions from the author. label May 12, 2023
jkotas and others added 3 commits May 12, 2023 00:50
@hoyosjs
Copy link
Member

hoyosjs commented May 12, 2023

@jkotas jkotas merged commit 9d289f4 into dotnet:main May 12, 2023
@jkotas jkotas deleted the official-build branch May 12, 2023 16:18
@BruceForstall
Copy link
Contributor

@jkotas @hoyosjs Thanks for doing this.

@ghost ghost locked as resolved and limited conversation to collaborators Jun 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Official build fails due to missing windows_arm job

3 participants