Building singlefilehost with clr partition. #48254

VSadov · 2021-02-12T23:27:53Z

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

dotnet-issue-labeler · 2021-02-12T23:27:56Z

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.

src/coreclr/CMakeLists.txt

src/coreclr/build-runtime.sh

VSadov · 2021-02-17T02:10:13Z

I think this is ready for review.

VSadov · 2021-02-17T02:14:31Z

src/coreclr/jit/CMakeLists.txt

@@ -348,14 +348,14 @@ else()
  clr_unknown_arch()
 endif()

-set(SOURCES
+set(JIT_CORE_SOURCES


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

VSadov · 2021-02-17T02:17:22Z

src/native/corehost/apphost/static/CMakeLists.txt

@@ -42,6 +42,20 @@ include(../../fxr/files.cmake)
 include(../../hostpolicy/files.cmake)
 include(../../hostcommon/files.cmake)

+if(MSVC)
+    add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4996>)


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

VSadov · 2021-02-17T02:18:23Z

src/native/corehost/apphost/static/CMakeLists.txt

-    get_property(ALL_COMPILE_OPTIONS TARGET ${PROJECT_NAME} PROPERTY COMPILE_OPTIONS)
-    string(TOUPPER ${RUNTIME_CONFIG} UPPERCASE_RUNTIME_CONFIG)
-
-    # make sure that certain compiler and linker settings match the runtime config


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

src/native/corehost/hostmisc/pal.windows.cpp

src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt

src/native/corehost/apphost/apphost.windows.cpp

src/native/corehost/build.sh

src/native/corehost/hostmisc/pal.windows.cpp

src/native/corehost/setup.cmake

janvorli

LGTM, thank you!

VSadov · 2021-02-19T22:20:46Z

Thanks!!!

ghost · 2021-02-19T22:21:23Z

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.

BruceForstall · 2021-02-20T10:12:38Z

@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 · 2021-02-20T10:44:25Z

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

am11 reviewed Feb 13, 2021

View reviewed changes

src/coreclr/CMakeLists.txt Outdated Show resolved Hide resolved

VSadov force-pushed the partitions branch from 9219707 to 33d7769 Compare February 13, 2021 19:11

danmoseley added the area-Infrastructure-coreclr label Feb 14, 2021

VSadov mentioned this pull request Feb 15, 2021

Use size_t for hostfxr info count members #48276

Merged

VSadov force-pushed the partitions branch from b334c38 to ddf94a7 Compare February 15, 2021 03:05

am11 reviewed Feb 15, 2021

View reviewed changes

src/coreclr/build-runtime.sh Outdated Show resolved Hide resolved

runfoapp bot mentioned this pull request Feb 15, 2021

Inability to unzip assets during build on Unix x64 #32805

Closed

VSadov force-pushed the partitions branch 2 times, most recently from 325bf4d to 488ee21 Compare February 15, 2021 20:03

VSadov changed the title ~~[WIP] Building singlefilehost from clr partition.~~ Building singlefilehost with clr partition. Feb 15, 2021

runfoapp bot mentioned this pull request Feb 15, 2021

System.Threading.Tasks.Tests timed out on net5.0-Linux-Debug-arm64-Mono_release #42024

Closed

VSadov force-pushed the partitions branch 3 times, most recently from 9839004 to 04bf9bb Compare February 17, 2021 00:16

VSadov requested review from janvorli and vitek-karas February 17, 2021 02:09

VSadov marked this pull request as ready for review February 17, 2021 02:09

VSadov commented Feb 17, 2021

View reviewed changes

src/native/corehost/hostmisc/pal.windows.cpp Show resolved Hide resolved

VSadov force-pushed the partitions branch 2 times, most recently from 6385035 to a874f3a Compare February 18, 2021 16:57

janvorli reviewed Feb 18, 2021

View reviewed changes

janvorli approved these changes Feb 19, 2021

View reviewed changes

VSadov added 2 commits February 19, 2021 14:20

building single file host with clr partition

7c01276

make coreclr_static a STATIC lib again

9dc3d78

VSadov force-pushed the partitions branch from a874f3a to 9dc3d78 Compare February 19, 2021 22:20

VSadov added the auto-merge label Feb 19, 2021

ghost merged commit 2b53a0a into dotnet:master Feb 20, 2021

VSadov deleted the partitions branch February 20, 2021 05:13

VSadov mentioned this pull request Feb 22, 2021

Hosts, in particular statically linked ones should be built in clr partition. #43700

Closed

gbalykov mentioned this pull request Feb 25, 2021

Add libatomic.a and keyutils dependencies in tizen rootfs dotnet/arcade#7023

Merged

elinor-fung mentioned this pull request Mar 12, 2021

Warnings for coreclr_static during build #38773

Closed

ghost locked as resolved and limited conversation to collaborators Mar 22, 2021

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Building singlefilehost with clr partition. #48254

Building singlefilehost with clr partition. #48254

VSadov commented Feb 12, 2021 •

edited

Loading

dotnet-issue-labeler bot commented Feb 12, 2021

VSadov commented Feb 17, 2021

VSadov Feb 17, 2021

VSadov Feb 17, 2021 •

edited

Loading

VSadov Feb 17, 2021

janvorli left a comment

VSadov commented Feb 19, 2021

ghost commented Feb 19, 2021

BruceForstall commented Feb 20, 2021

am11 commented Feb 20, 2021 •

edited

Loading

Building singlefilehost with clr partition. #48254

Building singlefilehost with clr partition. #48254

Conversation

VSadov commented Feb 12, 2021 • edited Loading

dotnet-issue-labeler bot commented Feb 12, 2021

VSadov commented Feb 17, 2021

VSadov Feb 17, 2021

Choose a reason for hiding this comment

VSadov Feb 17, 2021 • edited Loading

Choose a reason for hiding this comment

VSadov Feb 17, 2021

Choose a reason for hiding this comment

janvorli left a comment

Choose a reason for hiding this comment

VSadov commented Feb 19, 2021

ghost commented Feb 19, 2021

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.

BruceForstall commented Feb 20, 2021

am11 commented Feb 20, 2021 • edited Loading

VSadov commented Feb 12, 2021 •

edited

Loading

VSadov Feb 17, 2021 •

edited

Loading

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.

am11 commented Feb 20, 2021 •

edited

Loading