From 17468288b4093efc8fea4748ee3c890bf82535bb Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Wed, 10 May 2017 08:10:22 -0700 Subject: Allow users to enable automatic NI bind fallback via command-line (#11485) * Add FEATURE_NI_BIND_FALLBACK support * Fix incorrect variable setup * Negate the check condition * Use WIN32 instead of FEATURE_PAL * Check WIN32 first, and FEATURE_NI_BIND_FALLBACK later --- clrfeatures.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'clrfeatures.cmake') diff --git a/clrfeatures.cmake b/clrfeatures.cmake index 9991b60ed7..f047c91f7a 100644 --- a/clrfeatures.cmake +++ b/clrfeatures.cmake @@ -25,3 +25,11 @@ endif(NOT DEFINED FEATURE_DBGIPC) if(NOT DEFINED FEATURE_INTERPRETER) set(FEATURE_INTERPRETER 0) endif(NOT DEFINED FEATURE_INTERPRETER) + +if(NOT WIN32) + if(NOT DEFINED FEATURE_NI_BIND_FALLBACK) + if(NOT CLR_CMAKE_TARGET_ARCH_AMD64 AND NOT CLR_CMAKE_TARGET_ARCH_ARM64) + set(FEATURE_NI_BIND_FALLBACK 1) + endif() + endif(NOT DEFINED FEATURE_NI_BIND_FALLBACK) +endif(NOT WIN32) -- cgit v1.2.3