summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2016-01-03 16:13:11 -0800
committerJan Kotas <jkotas@microsoft.com>2016-01-03 16:13:11 -0800
commit4e6840be6001237262915f5d43461337a20b4499 (patch)
tree5a225c13944c8d2b1a2356e8500f0c1659ed53fd
parent215fb944857693e3bcc372d684b4ab2aa98d00cc (diff)
parente99a813c3af4f6aca82766ac344a4121f548366c (diff)
downloadcoreclr-4e6840be6001237262915f5d43461337a20b4499.tar.gz
coreclr-4e6840be6001237262915f5d43461337a20b4499.tar.bz2
coreclr-4e6840be6001237262915f5d43461337a20b4499.zip
Merge pull request #2503 from mikedn/4221again
Disable LNK4221 again
-rw-r--r--CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f72780c8a7..a6b7093033 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -423,6 +423,8 @@ if (WIN32)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4197,4013,4254,4070,4221")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /INCREMENTAL:NO")
+ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221")
+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")