Title: [197128] tags/Safari-602.1.20/Source/WebKit
- Revision
- 197128
- Author
- bshaf...@apple.com
- Date
- 2016-02-25 12:51:13 -0800 (Thu, 25 Feb 2016)
Log Message
Merged r197124. rdar://problem/24747822
Modified Paths
Diff
Modified: tags/Safari-602.1.20/Source/WebKit/ChangeLog (197127 => 197128)
--- tags/Safari-602.1.20/Source/WebKit/ChangeLog 2016-02-25 20:32:35 UTC (rev 197127)
+++ tags/Safari-602.1.20/Source/WebKit/ChangeLog 2016-02-25 20:51:13 UTC (rev 197128)
@@ -1,3 +1,18 @@
+2016-02-25 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r197124.
+
+ 2016-02-25 Brent Fulgham <bfulg...@apple.com>
+
+ [Win][CMake] Don't use incremental linking
+ https://bugs.webkit.org/show_bug.cgi?id=154684
+ <rdar://problem/24747822>
+
+ Reviewed by Alex Christensen.
+
+ * PlatformWin.cmake: Make sure the "/INCREMENTAL:NO" flag is used
+ (overriding "/INCREMENTAL:YES").
+
2016-02-22 Konstantin Tokarev <annu...@yandex.ru>
[cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
Modified: tags/Safari-602.1.20/Source/WebKit/PlatformWin.cmake (197127 => 197128)
--- tags/Safari-602.1.20/Source/WebKit/PlatformWin.cmake 2016-02-25 20:32:35 UTC (rev 197127)
+++ tags/Safari-602.1.20/Source/WebKit/PlatformWin.cmake 2016-02-25 20:51:13 UTC (rev 197128)
@@ -443,6 +443,22 @@
set(WebKit_LIBRARY_TYPE SHARED)
+# Make sure incremental linking is turned off, as it creates unacceptably long link times.
+string(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replace_CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
+set(CMAKE_SHARED_LINKER_FLAGS "${replace_CMAKE_SHARED_LINKER_FLAGS} /INCREMENTAL:NO")
+string(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replace_CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+set(CMAKE_EXE_LINKER_FLAGS "${replace_CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
+
+string(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replace_CMAKE_SHARED_LINKER_FLAGS_DEBUG ${CMAKE_SHARED_LINKER_FLAGS_DEBUG})
+set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${replace_CMAKE_SHARED_LINKER_FLAGS_DEBUG} /INCREMENTAL:NO")
+string(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replace_CMAKE_EXE_LINKER_FLAGS_DEBUG ${CMAKE_EXE_LINKER_FLAGS_DEBUG})
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${replace_CMAKE_EXE_LINKER_FLAGS_DEBUG} /INCREMENTAL:NO")
+
+string(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replace_CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO ${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO})
+set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${replace_CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /INCREMENTAL:NO")
+string(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replace_CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO})
+set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${replace_CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /INCREMENTAL:NO")
+
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
