Title: [194028] tags/Safari-602.1.13.3/Source/WebKit2
- Revision
- 194028
- Author
- [email protected]
- Date
- 2015-12-13 22:37:48 -0800 (Sun, 13 Dec 2015)
Log Message
Merged r194023. rdar://problem/23863828
Modified Paths
Diff
Modified: tags/Safari-602.1.13.3/Source/WebKit2/ChangeLog (194027 => 194028)
--- tags/Safari-602.1.13.3/Source/WebKit2/ChangeLog 2015-12-14 06:37:02 UTC (rev 194027)
+++ tags/Safari-602.1.13.3/Source/WebKit2/ChangeLog 2015-12-14 06:37:48 UTC (rev 194028)
@@ -1,5 +1,16 @@
2015-12-13 Babak Shafiei <[email protected]>
+ Merge r194023.
+
+ 2015-12-13 Dan Bernstein <[email protected]>
+
+ Another fix after r194018.
+
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+
+2015-12-13 Babak Shafiei <[email protected]>
+
Merge r194019.
2015-12-13 Dan Bernstein <[email protected]>
Modified: tags/Safari-602.1.13.3/Source/WebKit2/Configurations/BaseTarget.xcconfig (194027 => 194028)
--- tags/Safari-602.1.13.3/Source/WebKit2/Configurations/BaseTarget.xcconfig 2015-12-14 06:37:02 UTC (rev 194027)
+++ tags/Safari-602.1.13.3/Source/WebKit2/Configurations/BaseTarget.xcconfig 2015-12-14 06:37:48 UTC (rev 194028)
@@ -66,7 +66,7 @@
WK_DONT_LINK_SHIM = $(WK_DONT_LINK_SHIM_$(TARGET_MAC_OS_X_VERSION_MAJOR));
WK_DONT_LINK_SHIM_1090 = YES;
-WK_DONT_LINK_SHIM_1010 = YES;
+WK_DONT_LINK_SHIM_101000 = YES;
WK_LINK_SHIM[sdk=macosx*] = $(WK_LINK_SHIM_$(WK_DONT_LINK_SHIM));
WK_LINK_SHIM_ = $(WK_LINK_SHIM_NO);
Modified: tags/Safari-602.1.13.3/Source/WebKit2/Configurations/BaseXPCService.xcconfig (194027 => 194028)
--- tags/Safari-602.1.13.3/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2015-12-14 06:37:02 UTC (rev 194027)
+++ tags/Safari-602.1.13.3/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2015-12-14 06:37:48 UTC (rev 194028)
@@ -59,4 +59,4 @@
WK_XPC_SERVICE_INFOPLIST_SUFFIX[sdk=macosx*] = $(WK_XPC_SERVICE_INFOPLIST_SUFFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
WK_XPC_SERVICE_INFOPLIST_SUFFIX_1090 = -10.9-10.10;
-WK_XPC_SERVICE_INFOPLIST_SUFFIX_1010 = -10.9-10.10;
+WK_XPC_SERVICE_INFOPLIST_SUFFIX_101000 = -10.9-10.10;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
