From: danmosemsft <danmose@microsoft.com>
Date: Sun, 12 Feb 2017 18:59:14 +0000 (-0800)
Subject: Remove never used FEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE
X-Git-Tag: submit/tizen/20210909.063632~11030^2~8101^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=536becda52750255639751730207cdb103c12571;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Remove never used FEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE


Commit migrated from https://github.com/dotnet/coreclr/commit/c444460928696fbf348840a355678f649211db94
---

diff --git a/src/coreclr/clr.defines.targets b/src/coreclr/clr.defines.targets
index f09ff97..31513f3 100644
--- a/src/coreclr/clr.defines.targets
+++ b/src/coreclr/clr.defines.targets
@@ -41,7 +41,6 @@
         <CDefines Condition="'$(FeatureManagedEtw)' == 'true'">$(CDefines);FEATURE_MANAGED_ETW</CDefines>
         <CDefines Condition="'$(FeatureManagedEtwChannels)' == 'true'">$(CDefines);FEATURE_MANAGED_ETW_CHANNELS</CDefines>
         <CDefines Condition="'$(FeatureMdaSupported)' == 'true'">$(CDefines);MDA_SUPPORTED</CDefines>
-        <CDefines Condition="'$(FeatureMergeCultureSupportAndEngine)' == 'true'">$(CDefines);FEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE</CDefines>
         <CDefines Condition="'$(FeatureMergeJitAndEngine)' == 'true'">$(CDefines);FEATURE_MERGE_JIT_AND_ENGINE</CDefines>
         <CDefines Condition="'$(FeatureMetadataEmit)' == 'true'">$(CDefines);FEATURE_METADATA_EMIT</CDefines>
         <CDefines Condition="'$(FeatureMetadataEmitAll)' == 'true'">$(CDefines);FEATURE_METADATA_EMIT_ALL</CDefines>
diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake
index 4226866..defb71e 100644
--- a/src/coreclr/clrdefinitions.cmake
+++ b/src/coreclr/clrdefinitions.cmake
@@ -141,7 +141,6 @@ if (NOT CLR_CMAKE_PLATFORM_UNIX)
     add_definitions(-DFEATURE_MANAGED_ETW)
 endif(NOT CLR_CMAKE_PLATFORM_UNIX)
 add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS)
-add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE)
 
 if(FEATURE_MERGE_JIT_AND_ENGINE)
   # Disable the following for UNIX altjit on Windows