Title: [194027] tags/Safari-602.1.13.3/Source/WebKit2
- Revision
- 194027
- Author
- [email protected]
- Date
- 2015-12-13 22:37:02 -0800 (Sun, 13 Dec 2015)
Log Message
Merged r194019. rdar://problem/23863828
Modified Paths
Diff
Modified: tags/Safari-602.1.13.3/Source/WebKit2/ChangeLog (194026 => 194027)
--- tags/Safari-602.1.13.3/Source/WebKit2/ChangeLog 2015-12-14 06:36:14 UTC (rev 194026)
+++ tags/Safari-602.1.13.3/Source/WebKit2/ChangeLog 2015-12-14 06:37:02 UTC (rev 194027)
@@ -1,5 +1,15 @@
2015-12-13 Babak Shafiei <[email protected]>
+ Merge r194019.
+
+ 2015-12-13 Dan Bernstein <[email protected]>
+
+ Build fix.
+
+ * Configurations/PluginProcess.xcconfig:
+
+2015-12-13 Babak Shafiei <[email protected]>
+
Merge r194018.
2015-12-13 Dan Bernstein <[email protected]>
Modified: tags/Safari-602.1.13.3/Source/WebKit2/Configurations/PluginProcess.xcconfig (194026 => 194027)
--- tags/Safari-602.1.13.3/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-14 06:36:14 UTC (rev 194026)
+++ tags/Safari-602.1.13.3/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-14 06:37:02 UTC (rev 194027)
@@ -29,7 +29,7 @@
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(LDFLAGS_SHIM_$(CONFIGURATION));
-LDFLAGS_SHIM_Production[sdk=macosx*] = LDFLAGS_SHIM_$(WK_LINK_SHIM);
+LDFLAGS_SHIM_Production[sdk=macosx*] = $(LDFLAGS_SHIM_$(WK_LINK_SHIM));
LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
