From f7e65fe136f05d34ba0914d4b621dfa7ae2fa319 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 26 May 2014 15:31:07 +0000 Subject: [PATCH] [CMAKE/ARM] * Do not handle hotpatchable images in MSVC ARM builds (the flag is unknown to the compiler). svn path=/trunk/; revision=63469 --- reactos/cmake/CMakeMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake index f22723bbbef..fcb11dbdc09 100644 --- a/reactos/cmake/CMakeMacros.cmake +++ b/reactos/cmake/CMakeMacros.cmake @@ -459,7 +459,7 @@ function(set_module_type MODULE TYPE) # Handle hotpatchable images. # GCC has this as a function attribute so we're handling it using DECLSPEC_HOTPATCH - if(__module_HOTPATCHABLE AND MSVC) + if(__module_HOTPATCHABLE AND MSVC AND (NOT ARCH STREQUAL "arm")) set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS " /hotpatch") if(ARCH STREQUAL "i386") set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:5") -- 2.17.1