diff options
| -rw-r--r-- | clr.defines.targets | 1 | ||||
| -rw-r--r-- | clrdefinitions.cmake | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/clr.defines.targets b/clr.defines.targets index f09ff973b2..31513f3118 100644 --- a/clr.defines.targets +++ b/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/clrdefinitions.cmake b/clrdefinitions.cmake index 4226866c66..defb71e4dc 100644 --- a/clrdefinitions.cmake +++ b/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 |