diff options
| author | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-04-20 20:05:07 -0700 |
|---|---|---|
| committer | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-04-20 20:47:48 -0700 |
| commit | f9542ed35825ed4de37d454dfe0422f22971fa1e (patch) | |
| tree | 28aa7177696f98ece2ef45a07fee5197bf5e090b /clrdefinitions.cmake | |
| parent | 354b777f798cd5ebb85894a721f5bb4c1e9b49f5 (diff) | |
| download | coreclr-f9542ed35825ed4de37d454dfe0422f22971fa1e.tar.gz coreclr-f9542ed35825ed4de37d454dfe0422f22971fa1e.tar.bz2 coreclr-f9542ed35825ed4de37d454dfe0422f22971fa1e.zip | |
Correcting the definition for crosscomponents
Diffstat (limited to 'clrdefinitions.cmake')
| -rw-r--r-- | clrdefinitions.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index ed492e867d..5c9c3d0a33 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -1,4 +1,4 @@ -if(WIN32 AND CLR_CMAKE_PLATFORM_ARCH_I386 AND BUILD_JIT32) +if(WIN32 AND CLR_CMAKE_TARGET_ARCH_I386 AND BUILD_JIT32) set(CLR_BUILD_JIT32 1) else() set(CLR_BUILD_JIT32 0) @@ -7,7 +7,7 @@ endif() if (WIN32) set(FEATURE_EVENT_TRACE 1) endif() -if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_TARGET_ARCH_AMD64) set(FEATURE_EVENT_TRACE 1) endif() @@ -66,12 +66,12 @@ if(WIN32) add_definitions(-DWINVER=0x0602) add_definitions(-D_WIN32_WINNT=0x0602) add_definitions(-DWIN32_LEAN_AND_MEAN=1) - if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) # Only enable edit and continue on windows x86 and x64 # exclude Linux, arm & arm64 add_definitions(-DEnC_SUPPORTED) - endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) + endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) endif(WIN32) # Features - please keep them alphabetically sorted @@ -120,10 +120,10 @@ endif(NOT CLR_CMAKE_PLATFORM_UNIX_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) add_definitions(-DFEATURE_HOST_ASSEMBLY_RESOLVER) add_definitions(-DFEATURE_HOSTED_BINDER) add_definitions(-DFEATURE_ICASTABLE) -if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64) +if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_IMPLICIT_TLS) set(FEATURE_IMPLICIT_TLS 1) -endif(CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64) +endif(CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_ISYM_READER) add_definitions(-DFEATURE_LOADER_OPTIMIZATION) add_definitions(-DFEATURE_MANAGED_ETW) @@ -151,9 +151,9 @@ if(NOT DEFINED CLR_CMAKE_TARGET_ARCH_ARM64) set(FEATURE_READYTORUN 1) endif(NOT DEFINED CLR_CMAKE_TARGET_ARCH_ARM64) -if (CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) +if (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) add_definitions(-DFEATURE_REJIT) -endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) +endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) add_definitions(-DFEATURE_STANDALONE_SN) add_definitions(-DFEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED) |