Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 3593fba

Browse files
committed
Merge pull request #3066 from gkhanna79/Fix3049
Fix for CoreCLR issue 3049
2 parents 9b0a012 + 10d60ac commit 3593fba

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,10 @@ if (WIN32)
436436
add_compile_options(/guard:cf)
437437
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
438438
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
439+
440+
# Incremental linking with CFG is broken until next VS release.
441+
# Disable it for EXE linking (since it is disabled for DLLs already further below)
442+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
439443
endif (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
440444

441445
# Linker flags

0 commit comments

Comments
 (0)