Skip to content

Install crossgen, jitinterface, clrjit into the sharedframework folder in crosscomponent build. #51004

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.

Sign up for GitHub

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

Merged
5 commits merged into from
Apr 10, 2021
Merged

Install crossgen, jitinterface, clrjit into the sharedframework folder in crosscomponent build. #51004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3d088a
Install crossgen, jitinterface, clrjit into the sharedframework folder.
jkoritzinsky Apr 9, 2021
81721e5
Remove unneeded dependency
jkoritzinsky Apr 9, 2021
9011f87
Add dac/dbi to cross-component sharedFramework folder.
jkoritzinsky Apr 9, 2021
53d042b
Don't install the cross-os dac in crosscomponents in cross-bitness sc…
jkoritzinsky Apr 9, 2021
74ffae2
Jit Interface doesn't need to go into the sharedFramework folder (it …
jkoritzinsky Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/coreclr/crosscomponents.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Add targets to the crosscomponents subcomponent build

if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS)
install_clr (TARGETS
clrjit
DESTINATIONS . sharedFramework
COMPONENT crosscomponents
)
install_clr (TARGETS
clrjit
jitinterface_${ARCH_HOST_NAME}
Expand All @@ -11,15 +16,15 @@ if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS)
if(CLR_CMAKE_HOST_LINUX OR NOT FEATURE_CROSSBITNESS)
install_clr (TARGETS
crossgen
DESTINATIONS .
DESTINATIONS . sharedFramework
COMPONENT crosscomponents
)
endif()

if (CLR_CMAKE_TARGET_UNIX)
install_clr (TARGETS
clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
DESTINATIONS .
DESTINATIONS . sharedFramework
COMPONENT crosscomponents
)
endif(CLR_CMAKE_TARGET_UNIX)
Expand All @@ -29,7 +34,7 @@ if(NOT CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_OSX AND NOT FEATURE_CROSSBITN
install_clr (TARGETS
mscordaccore
mscordbi
DESTINATIONS .
DESTINATIONS . sharedFramework
COMPONENT crosscomponents
)
endif()
Expand Down
5 changes: 4 additions & 1 deletion src/coreclr/dlls/mscordac/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,5 +210,8 @@ if(CLR_CMAKE_HOST_WIN32)
string(REGEX MATCH "#define VER_FILEVERSION[ \t]+[0-9]+(,[0-9]+)+" FILE_VERSION_LINE "${NATIVE_VERSION_HEADER}")
string(REGEX MATCHALL "[0-9]+" FILE_VERSION_COMPONENTS "${FILE_VERSION_LINE}")
list(JOIN FILE_VERSION_COMPONENTS "." FILE_VERSION)
install(FILES $<TARGET_FILE:mscordaccore> RENAME mscordaccore_${LONG_NAME_HOST_ARCH}_${LONG_NAME_TARGET_ARCH}_${FILE_VERSION}.dll DESTINATION sharedFramework COMPONENT runtime)
install(PROGRAMS $<TARGET_FILE:mscordaccore> RENAME mscordaccore_${LONG_NAME_HOST_ARCH}_${LONG_NAME_TARGET_ARCH}_${FILE_VERSION}.dll DESTINATION sharedFramework COMPONENT runtime)
if (NOT FEATURE_CROSSBITNESS)
install(PROGRAMS $<TARGET_FILE:mscordaccore> RENAME mscordaccore_${LONG_NAME_HOST_ARCH}_${LONG_NAME_TARGET_ARCH}_${FILE_VERSION}.dll DESTINATION sharedFramework COMPONENT crosscomponents)
endif()
endif()