Make dependency on lld optional #85667
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tagging subscribers to this area: @hoyosjs Issue Detailsnull
|
This was referenced May 2, 2023
This reverts commit e8a297b.
jkotas
reviewed
May 3, 2023
| @@ -570,4 +569,28 @@ | |||
| Condition="'$(_WillCLRTestProjectBuild)' == 'true' and '$(CLRTestKind)' == 'BuildAndRun'" | |||
| DependsOnTargets="ComputeResolvedFilesToPublishList;LinkNative" /> | |||
|
|
|||
| <Target Name="LocateNativeCompiler" | |||
There was a problem hiding this comment.
There seems to be a lot of duplication of this logic. Would it be possible to have this logic in a shared file under eng and import it in all places that need it?
There was a problem hiding this comment.
Yeah - I've been meaning to share this and other logic that is already duplicated. There are some subtle differences, so I wanted to see if I could get it working first.
There was a problem hiding this comment.
I'd like to work on the sharing in a follow-up if that sounds ok to you. This fix will unblock some other things I can work on in parallel.
jkotas
reviewed
May 3, 2023
jkotas
approved these changes
May 4, 2023
sbomer
added a commit
to dotnet/dotnet-buildtools-prereqs-docker
that referenced
this pull request
May 4, 2023
This is no longer required with dotnet/runtime#85667, and will let us switch to the Ubuntu 22.04 images for the runtime-dev-innerloop runs.
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #84934. This detects availability of lld similarly to how we do it for the native components in
init-compiler.sh:runtime/eng/common/native/init-compiler.sh
Lines 130 to 132 in 34138a1
I tested this in ci (see third commit) by temporarily running the runtime-dev-innerloop pipeline on an Ubuntu 22.04 image I uploaded. After this goes in I will update the dotnet-buildtools-prereqs image to remove
lldand then use it in runtime-dev-innerloop.