Skip to content

Building singlefilehost with clr partition. - #48254

Merged
2 commits merged into
dotnet:masterfrom
VSadov:partitions
Feb 20, 2021
Merged

Building singlefilehost with clr partition.#48254
2 commits merged into
dotnet:masterfrom
VSadov:partitions

Conversation

@VSadov

@VSadov VSadov commented Feb 12, 2021

Copy link
Copy Markdown
Member
  • single file host builds with clr partition
  • removed hacks that align single file host build flavor and CRT to match with clr
  • host build script now just picks singlefilehost executable from clr artifacts
  • fixed a few places which introduce duplicate definitions when JIT and VM are linked together.

NOTE: static libs for the native libraries that are built in clr partitions are still installed into artifacts.
I left them be, in case there are other uses, but singlefilehost no longer needs them.

Resolves:#43700

@ghost

ghost commented Feb 12, 2021

Copy link
Copy Markdown

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.

Comment thread src/coreclr/CMakeLists.txt Outdated
Comment thread src/coreclr/build-runtime.sh Outdated
@VSadov
VSadov force-pushed the partitions branch 2 times, most recently from 325bf4d to 488ee21 Compare February 15, 2021 20:03
@VSadov VSadov changed the title [WIP] Building singlefilehost from clr partition. Building singlefilehost with clr partition. Feb 15, 2021
@VSadov
VSadov force-pushed the partitions branch 3 times, most recently from 9839004 to 04bf9bb Compare February 17, 2021 00:16
@VSadov
VSadov marked this pull request as ready for review February 17, 2021 02:09
@VSadov

VSadov commented Feb 17, 2021

Copy link
Copy Markdown
Member Author

I think this is ready for review.

Comment thread src/coreclr/jit/CMakeLists.txt Outdated

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This change was needed to not include resources in the statically linked JIT.

@VSadov VSadov Feb 17, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

these /wd defined for everything in host.native .
Since we build this separately from others now, I had to add the options here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I am very happy that this is gone. It seemed very fragile.

Comment thread src/native/corehost/hostmisc/pal.windows.cpp Outdated
@VSadov
VSadov force-pushed the partitions branch 2 times, most recently from 6385035 to a874f3a Compare February 18, 2021 16:57
Comment thread src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt Outdated
Comment thread src/native/corehost/apphost/apphost.windows.cpp Outdated
Comment thread src/native/corehost/build.sh Outdated
Comment thread src/native/corehost/hostmisc/pal.windows.cpp Outdated
Comment thread src/native/corehost/hostmisc/pal.windows.cpp Outdated
Comment thread src/native/corehost/setup.cmake Outdated

@janvorli janvorli left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you!

@VSadov

VSadov commented Feb 19, 2021

Copy link
Copy Markdown
Member Author

Thanks!!!

@ghost

ghost commented Feb 19, 2021

Copy link
Copy Markdown

Hello @VSadov!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost
ghost merged commit 2b53a0a into dotnet:master Feb 20, 2021
@VSadov
VSadov deleted the partitions branch February 20, 2021 05:13
@BruceForstall

Copy link
Copy Markdown
Contributor

@VSadov It appears this change broke the JIT rolling build (which only builds the JIT, using, for example, src/coreclr/build-runtime.cmd checked x64 -ci -skipruntime -nopgooptimize -skiprestoreoptdata):

https://dev.azure.com/dnceng/internal/_build/results?buildId=1004132&view=results

cc @dotnet/jit-contrib

@am11

am11 commented Feb 20, 2021

Copy link
Copy Markdown
Member

@BruceForstall, I have opened #48552 with the fix. The condition just need to include corehost directory conditionally.

This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Infrastructure-coreclr Only use for closed issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants