publish coreclr_static.lib into /lib

dotnet · May 27, 2020 · d72a5f2 · d72a5f2
1 parent 9e6c097
commit d72a5f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt
@@ -98,17 +98,13 @@ endif(FEATURE_MERGE_JIT_AND_ENGINE)
 # library.
 set(CORECLR_LIBRARIES
     utilcode
+    ${START_LIBRARY_GROUP} # Start group of libraries that have circular references
     cordbee_wks
     debug-pal
     ${LIB_UNWINDER}
     cee_wks
     v3binder
-
-    # Intentionally duplicated to ensure symbols are properly defined
-    cordbee_wks
-    debug-pal
-    ${LIB_UNWINDER}
-
+    ${END_LIBRARY_GROUP} # End group of libraries that have circular references
     mdcompiler_wks
     mdruntime_wks
     mdruntimerw_wks
@@ -239,5 +235,7 @@ endif(CLR_CMAKE_TARGET_WIN32)
 # add the install targets
 install_clr(TARGETS coreclr ADDITIONAL_DESTINATION sharedFramework)
 
+install (TARGETS coreclr_static DESTINATION lib)
+
 # Enable profile guided optimization
 add_pgo(coreclr)
diff --git a/src/coreclr/src/pal/src/CMakeLists.txt b/src/coreclr/src/pal/src/CMakeLists.txt
@@ -246,7 +246,7 @@ if(NOT CLR_CMAKE_USE_SYSTEM_LIBUNWIND)
 endif(NOT CLR_CMAKE_USE_SYSTEM_LIBUNWIND)
 
 add_library(coreclrpal
-  OBJECT
+  STATIC
   ${SOURCES}
   ${ARCH_SOURCES}
   ${PLATFORM_SOURCES}

diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
@@ -56,8 +56,8 @@ if (CLR_CMAKE_TARGET_WIN32 AND (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_AR
     target_link_libraries(singlefilehost Advapi32.lib shell32.lib)
 endif()
 
-# Path like: artifacts/obj/coreclr/Windows_NT.x64.Release/src/dlls/mscoree/coreclr/Release
-set(CORECLR_STATIC_LIB_LOCATION $ENV{__ObjDir}/coreclr/$ENV{__TargetOS}.$ENV{__BuildArch}.$ENV{__BuildType}/src/dlls/mscoree/coreclr/$ENV{__BuildType})
+# Path like: artifacts/bin/coreclr/Windows_NT.x64.Release/lib
+set(CORECLR_STATIC_LIB_LOCATION $ENV{__BinDir}/coreclr/$ENV{__TargetOS}.$ENV{__BuildArch}.$ENV{__BuildType}/lib)
 
 message ("Looking for coreclr_static lib at: '${CORECLR_STATIC_LIB_LOCATION}'.")