From d555b8df266595a577b2d22e240e6d799033fb0b Mon Sep 17 00:00:00 2001
From: Mikhail Kurinnoi <m.kurinnoi@samsung.com>
Date: Fri, 10 Sep 2021 10:25:35 -0700
Subject: [PATCH] Add corguids static library build.

---
 CMakeLists.txt     | 15 ++++++++++++++-
 src/CMakeLists.txt |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb2470c..191c47c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,8 +50,21 @@ include_directories("${CLR_SRC_DIR}/src/pal/inc/rt")
 include_directories("${CLR_SRC_DIR}/src/inc")
 include_directories("${CLR_BIN_DIR}/inc")
 
+# Build corguids static library from coreclr source files
+if (NOT WIN32)
+    add_compile_options(-Wno-extra-tokens)
+endif()
+add_compile_options(-D_MIDL_USE_GUIDDEF_)
+file(GLOB CORGUIDS_SOURCES "${CLR_SRC_DIR}/src/pal/prebuilt/idl/*_i.cpp")
+add_library(corguids STATIC ${CORGUIDS_SOURCES})
+if (NOT WIN32)
+    target_compile_options(corguids PRIVATE -Wno-unused-parameter)
+    target_include_directories(corguids PRIVATE ${CLR_SRC_DIR}/src/pal/inc ${CLR_SRC_DIR}/src/pal/inc/rt)
+    target_include_directories(corguids PRIVATE ${CLR_SRC_DIR}/src/inc ${CLR_SRC_DIR}/src/debug/inc)
+endif()
+
 # Import CoreCLR libraries
-foreach(static_lib libcorguids libcoreclrpal libpalrt)
+foreach(static_lib libcoreclrpal libpalrt)
   add_library(${static_lib} STATIC IMPORTED)
   set_target_properties(${static_lib} PROPERTIES
     IMPORTED_LOCATION ${CLR_BIN_DIR}/lib/${static_lib}.a
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e74b9b1..3e754fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,7 +49,7 @@ set_property(
 )
 
 target_link_libraries(coreprof
-  # libcorguids
+  corguids
   # utilcodestaticnohost
   # gcinfo
   # mscorrc_debug
-- 
2.34.1