Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix composite Crossgen2 runs on Windows and clean up R2R pipelines #43261

Merged
merged 1 commit into from
Oct 11, 2020

Commits on Oct 10, 2020

  1. Fix composite Crossgen2 runs on Windows and clean up R2R pipelines

    Some time ago I introduced a new option "crossgenframeworkonly"
    in the test build scripts and I modified the CoreCLR pipeline
    to use it. Turns out it was never fully functional, crossgenning
    framework continued taking place in the CORE_ROOT population phase
    (generatelayoutonly) and only on Windows it got duplicated in the
    subsequent "crossgen framework" step. This duplication moreover
    uncovered a bug in the R2RTest tool - when compiling the framework
    in composite mode twice in a row, the tool was incorrectly
    manipulating the composite file "framework-r2r.dll", causing an
    error in the second framework crossgenning step.
    
    I believe that it's completely logical to crossgen the framework
    as part of populating CORE_ROOT. In light of this fact I have just
    deleted the separate "crossgen framework" step and the corresponding
    build script options. I have also fixed the described bug in R2RTest
    related to repeated framework crossgenning in composite mode to
    restore the invariant that framework crossgenning should be idempotent.
    
    Thanks
    
    Tomas
    trylek committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    48d6f3e View commit details
    Browse the repository at this point in the history