<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194018] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194018">194018</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-12-13 15:21:35 -0800 (Sun, 13 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Shims aren’t inserted properly on Yosemite when building with the El Capitan SDK
https://bugs.webkit.org/show_bug.cgi?id=152229
Reviewed by Darin Adler.
* Configurations/BaseTarget.xcconfig: Defined WK_LINK_SHIM on OS X to YES or NO based on the
target version.
* Configurations/BaseXPCService.xcconfig: Define WK_XPC_SERVICE_INFOPLIST_SUFFIX to
"-10.9-10.10" when targeting those OS X versions.
* Configurations/NetworkService.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
* Configurations/PluginProcess.xcconfig: Use WK_LINK_SHIM in the definition of
LDFLAGS_SHIM_Production for OS X.
* Configurations/PluginService.32.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
* Configurations/PluginService.64.xcconfig: Ditto.
* Configurations/WebContentService.xcconfig: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseTargetxcconfig">trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseXPCServicexcconfig">trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsNetworkServicexcconfig">trunk/Source/WebKit2/Configurations/NetworkService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginProcessxcconfig">trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginService32xcconfig">trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginService64xcconfig">trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentServicexcconfig">trunk/Source/WebKit2/Configurations/WebContentService.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194017 => 194018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-13 23:21:35 UTC (rev 194018)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-13 Dan Bernstein <mitz@apple.com>
+
+ [Mac] Shims aren’t inserted properly on Yosemite when building with the El Capitan SDK
+ https://bugs.webkit.org/show_bug.cgi?id=152229
+
+ Reviewed by Darin Adler.
+
+ * Configurations/BaseTarget.xcconfig: Defined WK_LINK_SHIM on OS X to YES or NO based on the
+ target version.
+ * Configurations/BaseXPCService.xcconfig: Define WK_XPC_SERVICE_INFOPLIST_SUFFIX to
+ "-10.9-10.10" when targeting those OS X versions.
+ * Configurations/NetworkService.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
+ definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
+ * Configurations/PluginProcess.xcconfig: Use WK_LINK_SHIM in the definition of
+ LDFLAGS_SHIM_Production for OS X.
+ * Configurations/PluginService.32.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
+ definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
+ * Configurations/PluginService.64.xcconfig: Ditto.
+ * Configurations/WebContentService.xcconfig: Ditto.
+
</ins><span class="cx"> 2015-12-12 Katlyn Graff <kgraff@apple.com>
</span><span class="cx">
</span><span class="cx"> Safari background tabs should be fully suspended where possible.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (194017 => 194018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
</span><span class="lines">@@ -63,3 +63,12 @@
</span><span class="cx">
</span><span class="cx"> WK_MANUAL_SANDBOXING_DEFINES = $(WK_MANUAL_SANDBOXING_DEFINES_$(WK_MANUAL_SANDBOXING_ENABLED));
</span><span class="cx"> WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
</span><ins>+
+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_LINK_SHIM[sdk=macosx*] = $(WK_LINK_SHIM_$(WK_DONT_LINK_SHIM));
+WK_LINK_SHIM_ = $(WK_LINK_SHIM_NO);
+WK_LINK_SHIM_NO = YES;
+WK_LINK_SHIM_YES = NO;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseXPCServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (194017 => 194018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
</span><span class="lines">@@ -54,3 +54,7 @@
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_ = $(CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_NO);
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_NO = Configurations/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE).entitlements;
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_YES = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE)-no-sandbox.entitlements;
</span><ins>+
+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;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsNetworkServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/NetworkService.xcconfig (194017 => 194018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
</span><span class="lines">@@ -28,11 +28,7 @@
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Networking;
</span><span class="cx"> INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
</span><del>-INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
-INFOPLIST_FILE[sdk=macosx10.9*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
-INFOPLIST_FILE[sdk=macosx10.10*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
</del><ins>+INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
</ins><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = ;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = ;
</del><ins>+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
+OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig (194017 => 194018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
</span><span class="lines">@@ -29,9 +29,8 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(LDFLAGS_SHIM_$(CONFIGURATION));
</span><span class="cx">
</span><del>-LDFLAGS_SHIM_Production[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
-LDFLAGS_SHIM_Production[sdk=macosx10.9*] = ;
-LDFLAGS_SHIM_Production[sdk=macosx10.10*] = ;
</del><ins>+LDFLAGS_SHIM_Production[sdk=macosx*] = LDFLAGS_SHIM_$(WK_LINK_SHIM);
+LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
</ins><span class="cx">
</span><span class="cx"> EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginService32xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (194017 => 194018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
</span><span class="lines">@@ -30,14 +30,11 @@
</span><span class="cx"> VALID_ARCHS_macosx_NO = i386;
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Plugin.32;
</span><del>-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
</del><ins>+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
</ins><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</span><del>-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
</del><ins>+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
+OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
</ins><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginService64xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (194017 => 194018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
</span><span class="lines">@@ -30,14 +30,11 @@
</span><span class="cx"> VALID_ARCHS_macosx_NO = x86_64;
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Plugin.64;
</span><del>-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
</del><ins>+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
</ins><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</span><del>-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
</del><ins>+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
+OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
</ins><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (194017 => 194018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
</span><span class="lines">@@ -28,9 +28,7 @@
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.WebContent;
</span><span class="cx"> INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
</span><del>-INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
-INFOPLIST_FILE[sdk=macosx10.9*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
-INFOPLIST_FILE[sdk=macosx10.10*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
</del><ins>+INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
</ins><span class="cx">
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="lines">@@ -40,6 +38,5 @@
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_101200 = CFBundleFollowParentLocalization;
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
</span><del>-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
</del><ins>+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
+OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
</ins></span></pre>
</div>
</div>
</body>
</html>