Fix build error for mscoree coreclr.exports (#24547)

[platform/upstream/coreclr.git] / clrdefinitions.cmake

diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index 796261e..a7fae41 100644 (file)
--- a/clrdefinitions.cmake
+++ b/clrdefinitions.cmake
@@ -6,7 +6,8 @@ set(PRERELEASE 1)
 
 # Features we're currently flighting, but don't intend to ship in officially supported releases
 if (PRERELEASE)
-  add_definitions(-DFEATURE_DEFAULT_INTERFACES=1)  
+  add_definitions(-DFEATURE_UTF8STRING=1)  
+  # add_definitions(-DFEATURE_XXX=1)
 endif (PRERELEASE)
 
 if (CLR_CMAKE_TARGET_ARCH_AMD64)
@@ -119,6 +120,7 @@ if(FEATURE_DBGIPC)
   add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI)
   add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM)
 endif(FEATURE_DBGIPC)
+add_definitions(-DFEATURE_DEFAULT_INTERFACES)
 if(FEATURE_EVENT_TRACE)
     add_definitions(-DFEATURE_EVENT_TRACE=1)
     add_definitions(-DFEATURE_PERFTRACING=1)
@@ -209,9 +211,9 @@ if(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64)
   add_definitions(-DUNIX_AMD64_ABI)
 endif(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64)
 add_definitions(-DFEATURE_USE_ASM_GC_WRITE_BARRIERS)
-if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR (CLR_CMAKE_PLATFORM_ARCH_ARM64 AND NOT WIN32))
+if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64)
   add_definitions(-DFEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP)
-endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR (CLR_CMAKE_PLATFORM_ARCH_ARM64 AND NOT WIN32))
+endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64)
 if((CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT WIN32)
   add_definitions(-DFEATURE_MANUALLY_MANAGED_CARD_BUNDLES)
 endif((CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT WIN32)