Support FEATURE_DBGIPC override (dotnet/coreclr#11164)

Commit migrated from https://github.com/dotnet/coreclr/commit/6899c2ae00414267f3d6c2029b7897d7374d46e1

diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake
index 3f4122a..f14317d 100644 (file)
--- a/src/coreclr/clrdefinitions.cmake
+++ b/src/coreclr/clrdefinitions.cmake
@@ -110,10 +110,10 @@ if (CLR_CMAKE_PLATFORM_UNIX)
 endif(CLR_CMAKE_PLATFORM_UNIX)
 add_definitions(-DFEATURE_CORESYSTEM)
 add_definitions(-DFEATURE_CORRUPTING_EXCEPTIONS)
-if(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID))
-    add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI)
-    add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM)
-endif(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID))
+if(FEATURE_DBGIPC)
+  add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI)
+  add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM)
+endif(FEATURE_DBGIPC)
 if(FEATURE_EVENT_TRACE)
     add_definitions(-DFEATURE_EVENT_TRACE=1)
 endif(FEATURE_EVENT_TRACE)

diff --git a/src/coreclr/clrfeatures.cmake b/src/coreclr/clrfeatures.cmake
index 0cbd585..f7c7c4a 100644 (file)
--- a/src/coreclr/clrfeatures.cmake
+++ b/src/coreclr/clrfeatures.cmake
@@ -15,3 +15,9 @@ if(NOT DEFINED FEATURE_EVENT_TRACE)
     endif()
   endif(CLR_CMAKE_PLATFORM_LINUX)
 endif(NOT DEFINED FEATURE_EVENT_TRACE)
+
+if(NOT DEFINED FEATURE_DBGIPC)
+  if(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID))
+    set(FEATURE_DBGIPC 1)
+  endif(CLR_CMAKE_PLATFORM_UNIX)
+endif(NOT DEFINED FEATURE_DBGIPC)