summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2016-02-06 14:10:46 -0800
committerGaurav Khanna <gkhanna@microsoft.com>2016-02-06 14:10:46 -0800
commit10d60acdfa723aaae7710f8c72a9b5f6fda4391f (patch)
treeb75d52904ef660af841aac55914542820d3a5138 /CMakeLists.txt
parent405eb72a0f442a96ec814fd2a9995925b3b0b1ee (diff)
downloadcoreclr-10d60acdfa723aaae7710f8c72a9b5f6fda4391f.tar.gz
coreclr-10d60acdfa723aaae7710f8c72a9b5f6fda4391f.tar.bz2
coreclr-10d60acdfa723aaae7710f8c72a9b5f6fda4391f.zip
Fix for CoreCLR issue 3049
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1da3550a6f..65fb3f3555 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,6 +436,10 @@ if (WIN32)
add_compile_options(/guard:cf)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
+
+ # Incremental linking with CFG is broken until next VS release.
+ # Disable it for EXE linking (since it is disabled for DLLs already further below)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
endif (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
# Linker flags