diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2021-02-24 20:12:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 20:12:38 +0300 |
| commit | e4727784441d46d416bba16ff1404a4942b53e62 (patch) | |
| tree | 4ab109082a09b2f4440e64580955e9f652284794 /src/coreclr/clrdefinitions.cmake | |
| parent | 8f0f819d49c75a57dd2bc3e0a80e7cbd8ec520e1 (diff) | |
Hot reload for xplat change broke DAC (#48672)
On Linux/MacOS only enabled ENC for the debug/ee and vm directories and that
through some the EE's data structure's vtables between the runtime and DAC.
Diffstat (limited to 'src/coreclr/clrdefinitions.cmake')
| -rw-r--r-- | src/coreclr/clrdefinitions.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 8f7b43fe617..9c774cd4aeb 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -57,12 +57,13 @@ if(CLR_CMAKE_HOST_WIN32) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif(CLR_CMAKE_HOST_WIN32) -if(CLR_CMAKE_TARGET_WIN32) - if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) - # Only enable edit and continue on x86 and x64, exclude arm & arm64 - add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:EnC_SUPPORTED>) - endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) -endif(CLR_CMAKE_TARGET_WIN32) +# Only enable edit and continue on x86 and x64, exclude arm & arm64 +if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) + add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:EnC_SUPPORTED>) + if(CLR_CMAKE_TARGET_WIN32) + add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_ENC_SUPPORTED>) + endif(CLR_CMAKE_TARGET_WIN32) +endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) # Features - please keep them alphabetically sorted if(CLR_CMAKE_TARGET_WIN32) |