Remove usages of native bootstrapping #65901
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
|
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
|
/azp run runtime-staging |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue Detailsnull
|
Co-authored-by: Adeel Mujahid <[email protected]>
hoyosjs
force-pushed
the
juhoyosa/remove-native-bootstrap
branch
from
fc545b0
to
d6e3a31
Compare
|
/azp run runtime-coreclr superpmi-replay |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jkotas
approved these changes
Feb 25, 2022
agocke
reviewed
Feb 25, 2022
| @@ -491,6 +491,7 @@ | |||
| <_MonoCMakeBuildCommand Condition="'$(_MonoUseNinja)' != 'true'">$(_MonoCMakeBuildCommand) --parallel $([System.Environment]::ProcessorCount)</_MonoCMakeBuildCommand> | |||
| <_MonoCMakeBuildCommand Condition="'$(TargetsBrowser)' != 'true' and '$(HostOS)' != 'windows'">@(_MonoBuildEnv, ' ') $(_MonoCMakeBuildCommand)</_MonoCMakeBuildCommand> | |||
| <_MonoCMakeBuildCommand Condition="'$(TargetsBrowser)' != 'true' and '$(HostOS)' == 'windows'">call "$(RepositoryEngineeringDir)native\init-vs-env.cmd" $(_CompilerTargetArch) && cd /D "$(MonoObjDir)" && @(_MonoBuildEnv, ' ') $(_MonoCMakeBuildCommand)</_MonoCMakeBuildCommand> | |||
| <_MonoCMakeBuildCommand Condition="'$(TargetsBrowser)' == 'true' and '$(HostOS)' == 'windows'">call "$(RepositoryEngineeringDir)native\init-vs-env.cmd" && $(_MonoCMakeBuildCommand)</_MonoCMakeBuildCommand> | |||
There was a problem hiding this comment.
What's the main difference between this and the above? The addition of _MonoBuildEnv?
There was a problem hiding this comment.
yup, $(_CompilerTargetArch) and the build env
There was a problem hiding this comment.
Before it was using line 489 on wasm, and it was failing to find cmake on PATH. Now we are prepending it with eng\native\init-vs-env.cmd && so PATH gets updated by VS cmd init script that has cmake bin path.
agocke
approved these changes
Feb 25, 2022
|
The only case where I am seeing crashes is x86. This seems like a suspension context issue: |
|
Yes, that is #65890 |
|
We'll need to backport this to basically all earlier release branches right? |
|
Yes |
|
/backport to release/7.0-preview2 |
|
Started backporting to release/7.0-preview2: https://github.com/dotnet/runtime/actions/runs/1912448074 |
|
/backport to release/5.0 |
|
Started backporting to release/5.0: https://github.com/dotnet/runtime/actions/runs/1959416794 |
|
@agocke backporting to release/5.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Remove usages of native bootstrapping
Using index info to reconstruct a base tree...
M eng/pipelines/common/global-build-job.yml
M eng/pipelines/common/templates/runtimes/build-test-job.yml
A eng/pipelines/coreclr/templates/build-jit-job.yml
M eng/pipelines/coreclr/templates/build-job.yml
M eng/pipelines/mono/templates/build-job.yml
A eng/pipelines/mono/templates/generate-offsets.yml
M global.json
Falling back to patching base and 3-way merge...
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
CONFLICT (modify/delete): eng/pipelines/mono/templates/generate-offsets.yml deleted in HEAD and modified in Remove usages of native bootstrapping. Version Remove usages of native bootstrapping of eng/pipelines/mono/templates/generate-offsets.yml left in tree.
Auto-merging eng/pipelines/mono/templates/build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/mono/templates/build-job.yml
Auto-merging eng/pipelines/coreclr/templates/build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/coreclr/templates/build-job.yml
CONFLICT (modify/delete): eng/pipelines/coreclr/templates/build-jit-job.yml deleted in HEAD and modified in Remove usages of native bootstrapping. Version Remove usages of native bootstrapping of eng/pipelines/coreclr/templates/build-jit-job.yml left in tree.
Auto-merging eng/pipelines/common/templates/runtimes/build-test-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/common/templates/runtimes/build-test-job.yml
Auto-merging eng/pipelines/common/global-build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/common/global-build-job.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove usages of native bootstrapping
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
agocke
pushed a commit
to agocke/runtime
that referenced
this pull request
Mar 9, 2022
* Remove usages of native bootstrapping * Make sure cmake is in the path for mono wasm builds Co-authored-by: Adeel Mujahid <[email protected]> (cherry picked from commit 8727ac7)
carlossanlop
pushed a commit
that referenced
this pull request
Mar 15, 2022
* Remove usages of native bootstrapping (#65901) * Remove usages of native bootstrapping * Make sure cmake is in the path for mono wasm builds Co-authored-by: Adeel Mujahid <[email protected]> (cherry picked from commit 8727ac7) * Fix building CoreCLR for x86 with the Windows 10.0.20348.0 SDK (#57067) The SDK now defines CONTEXT_UNWOUND_TO_CALL in more cases, so we get a macro redefinition error. Since the SDK defines it to the same value as we do, just skip our definition if it's already defined. (cherry picked from commit ce4bf13) * Port CMake fixes for latest version Co-authored-by: Juan Hoyos <[email protected]> Co-authored-by: Jeremy Koritzinsky <[email protected]>
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.
No description provided.