Title: [230673] trunk/Source/WebKit
- Revision
- 230673
- Author
- timo...@apple.com
- Date
- 2018-04-16 11:29:19 -0700 (Mon, 16 Apr 2018)
Log Message
Clean up OTHER_LDFLAGS for WebKit processes
https://bugs.webkit.org/show_bug.cgi?id=184657
Reviewed by Jer Noble.
* Configurations/PluginProcessShim.xcconfig:
* Configurations/PluginService.32.xcconfig:
* Configurations/PluginService.64.xcconfig:
* Configurations/WebContentService.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (230672 => 230673)
--- trunk/Source/WebKit/ChangeLog 2018-04-16 18:05:42 UTC (rev 230672)
+++ trunk/Source/WebKit/ChangeLog 2018-04-16 18:29:19 UTC (rev 230673)
@@ -1,3 +1,15 @@
+2018-04-16 Timothy Hatcher <timo...@apple.com>
+
+ Clean up OTHER_LDFLAGS for WebKit processes
+ https://bugs.webkit.org/show_bug.cgi?id=184657
+
+ Reviewed by Jer Noble.
+
+ * Configurations/PluginProcessShim.xcconfig:
+ * Configurations/PluginService.32.xcconfig:
+ * Configurations/PluginService.64.xcconfig:
+ * Configurations/WebContentService.xcconfig:
+
2018-04-15 Michael Catanzaro <mcatanz...@igalia.com>
[WPE] Install files needed for WebKitWebExtensions
Modified: trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig (230672 => 230673)
--- trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig 2018-04-16 18:05:42 UTC (rev 230672)
+++ trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig 2018-04-16 18:29:19 UTC (rev 230673)
@@ -25,5 +25,13 @@
#include "Shim.xcconfig"
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit -framework Carbon -framework QuartzCore;
+WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
+
+WK_CARBON_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_CARBON_LDFLAGS_macosx = -framework Carbon;
+
+WK_QUARTZCORE_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_QUARTZCORE_LDFLAGS_macosx = -framework QuartzCore;
+
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_QUARTZCORE_LDFLAGS);
Modified: trunk/Source/WebKit/Configurations/PluginService.32.xcconfig (230672 => 230673)
--- trunk/Source/WebKit/Configurations/PluginService.32.xcconfig 2018-04-16 18:05:42 UTC (rev 230672)
+++ trunk/Source/WebKit/Configurations/PluginService.32.xcconfig 2018-04-16 18:29:19 UTC (rev 230673)
@@ -32,9 +32,12 @@
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
+OTHER_LDFLAGS = $(inherited) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
SKIP_INSTALL = $(WK_BUILDING_ONLY_X86_64);
Modified: trunk/Source/WebKit/Configurations/PluginService.64.xcconfig (230672 => 230673)
--- trunk/Source/WebKit/Configurations/PluginService.64.xcconfig 2018-04-16 18:05:42 UTC (rev 230672)
+++ trunk/Source/WebKit/Configurations/PluginService.64.xcconfig 2018-04-16 18:29:19 UTC (rev 230673)
@@ -29,9 +29,12 @@
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
+OTHER_LDFLAGS = $(inherited) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
SKIP_INSTALL[sdk=iphone*] = YES;
Modified: trunk/Source/WebKit/Configurations/WebContentService.xcconfig (230672 => 230673)
--- trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2018-04-16 18:05:42 UTC (rev 230672)
+++ trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2018-04-16 18:29:19 UTC (rev 230673)
@@ -38,9 +38,12 @@
INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
+WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
+
WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_$(WK_EMPTY_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT)));
WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_ = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_NO);
WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_NO = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
