summaryrefslogtreecommitdiff
path: root/clrdefinitions.cmake
diff options
context:
space:
mode:
authorMyungJoo Ham <myungjoo.ham@samsung.com>2016-04-29 19:34:36 +0900
committerMyungJoo Ham <myungjoo.ham@samsung.com>2016-04-29 19:34:36 +0900
commit617e1311f42be82fcf3a1a9f6e9218cfaa1de8bf (patch)
tree9dd48640f70105e5aa546bf2899c07f1e72e8876 /clrdefinitions.cmake
parenta3617d5dc2de62d86c2c554d94f070315ff23aa8 (diff)
downloadcoreclr-617e1311f42be82fcf3a1a9f6e9218cfaa1de8bf.tar.gz
coreclr-617e1311f42be82fcf3a1a9f6e9218cfaa1de8bf.tar.bz2
coreclr-617e1311f42be82fcf3a1a9f6e9218cfaa1de8bf.zip
Ensure FEATURE_MANAGED_ETW isn't set for TargetUnix 2
The commit 82492f7fe7d91331508cb1bf9b33e2e9725d9898 has disabled FEATURE_MANAGED_ETW for UNIX builds. However, the commit somehow omitted updating CMakeList accordingly while updating msbuild scripts. This patch does the same for CMake scripts. Fixes #4682 part 1. Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Diffstat (limited to 'clrdefinitions.cmake')
-rw-r--r--clrdefinitions.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index bc39e108c4..7f3dfc5dd9 100644
--- a/clrdefinitions.cmake
+++ b/clrdefinitions.cmake
@@ -126,7 +126,9 @@ if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64)
endif(CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64)
add_definitions(-DFEATURE_ISYM_READER)
add_definitions(-DFEATURE_LOADER_OPTIMIZATION)
+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_MAIN_CLR_MODULE_USES_CORE_NAME)
add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE)