Explicitly link XPC services with AppKit
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Jan 2014 00:01:39 +0000 (00:01 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Jan 2014 00:01:39 +0000 (00:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=127520
<rdar://problem/15759718>

Reviewed by Mark Rowe.

Explicitly link XPC services that use the _NSApplicationMain run loop type with AppKit.

* Configurations/PluginService.32.xcconfig:
* Configurations/PluginService.64.xcconfig:
* Configurations/PluginService.Development.xcconfig:
* Configurations/WebContentService.Development.xcconfig:
* Configurations/WebContentService.xcconfig:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162658 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/PluginService.32.xcconfig
Source/WebKit2/Configurations/PluginService.64.xcconfig
Source/WebKit2/Configurations/PluginService.Development.xcconfig
Source/WebKit2/Configurations/WebContentService.Development.xcconfig
Source/WebKit2/Configurations/WebContentService.xcconfig

index 668b998..670b589 100644 (file)
@@ -1,5 +1,21 @@
 2014-01-23  Anders Carlsson  <andersca@apple.com>
 
+        Explicitly link XPC services with AppKit
+        https://bugs.webkit.org/show_bug.cgi?id=127520
+        <rdar://problem/15759718>
+
+        Reviewed by Mark Rowe.
+
+        Explicitly link XPC services that use the _NSApplicationMain run loop type with AppKit.
+
+        * Configurations/PluginService.32.xcconfig:
+        * Configurations/PluginService.64.xcconfig:
+        * Configurations/PluginService.Development.xcconfig:
+        * Configurations/WebContentService.Development.xcconfig:
+        * Configurations/WebContentService.xcconfig:
+
+2014-01-23  Anders Carlsson  <andersca@apple.com>
+
         Fix build again.
 
         * UIProcess/API/mac/WKView.mm:
index e00306b..dc19d43 100644 (file)
@@ -40,7 +40,8 @@ FRAMEWORK_LDFLAGS_ = -framework WebKit2;
 FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
 FRAMEWORK_LDFLAGS_YES = ;
 
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS_macosx = -framework AppKit;
 
 CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
 
index d810025..5b6ae26 100644 (file)
@@ -40,7 +40,8 @@ FRAMEWORK_LDFLAGS_ = -framework WebKit2;
 FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
 FRAMEWORK_LDFLAGS_YES = ;
 
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS_macosx = -framework AppKit;
 
 CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
 
index 652fe87..6567ea1 100644 (file)
@@ -32,3 +32,6 @@ SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
 SKIP_INSTALL_macosx = $(inherited);
 SKIP_INSTALL_iphoneos = YES;
 SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -framework AppKit;
index 34251a4..8201b62 100644 (file)
@@ -25,3 +25,6 @@
 
 PRODUCT_NAME = com.apple.WebKit.WebContent.Development;
 INFOPLIST_FILE = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info.plist;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -framework AppKit;
index fe1c44a..a67ecb3 100644 (file)
@@ -28,3 +28,6 @@ PRODUCT_NAME = com.apple.WebKit.WebContent;
 INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
 INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
 INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -framework AppKit;