projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4eae62)
Allow Hostx64/arm32 combination in configurecompiler.cmake
authorEgor Chesakov <Egor.Chesakov@microsoft.com>
Fri, 17 Aug 2018 20:47:07 +0000 (13:47 -0700)
committerEgor Chesakov <Egor.Chesakov@microsoft.com>
Mon, 10 Sep 2018 22:37:33 +0000 (15:37 -0700)
Commit migrated from https://github.com/dotnet/coreclr/commit/ccf1c10ad9812c9fc99237997f491c4036f6a5a4

src/coreclr/configurecompiler.cmake patch | blob | history

diff --git a/src/coreclr/configurecompiler.cmake b/src/coreclr/configurecompiler.cmake
index 41e881c..2d1672b 100644 (file)
--- a/src/coreclr/configurecompiler.cmake
+++ b/src/coreclr/configurecompiler.cmake
@@ -158,7 +158,7 @@ endif()
 
 # check if host & target arch combination are valid
 if(NOT(CLR_CMAKE_TARGET_ARCH STREQUAL CLR_CMAKE_HOST_ARCH))
-    if(NOT((CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM64) OR (CLR_CMAKE_PLATFORM_ARCH_I386 AND CLR_CMAKE_TARGET_ARCH_ARM)))
+    if(NOT((CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM64) OR (CLR_CMAKE_PLATFORM_ARCH_I386 AND CLR_CMAKE_TARGET_ARCH_ARM) OR (CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM)))
         message(FATAL_ERROR "Invalid host and target arch combination")
     endif()
 endif()
Domain: Dotnet / Core;