[webkit-changes] [169846] trunk/Source/WebKit2

Wed, 11 Jun 2014 15:32:06 -0700

Title: [169846] trunk/Source/WebKit2
Revision
169846
Author
[email protected]
Date
2014-06-11 15:31:31 -0700 (Wed, 11 Jun 2014)

Log Message

[Cocoa] Xcode cannot infer that the WebKit target implicitly depends on WebCore.framework
https://bugs.webkit.org/show_bug.cgi?id=133765

Reviewed by Anders Carlsson.

* Configurations/WebKit.xcconfig: Move linking against WebCore from OTHER_LDFLAGS here...
* WebKit2.xcodeproj/project.pbxproj: ...to the Link Binary With Libraries build phase here.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (169845 => 169846)


--- trunk/Source/WebKit2/ChangeLog	2014-06-11 22:08:34 UTC (rev 169845)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-11 22:31:31 UTC (rev 169846)
@@ -1,3 +1,13 @@
+2014-06-11  Dan Bernstein  <[email protected]>
+
+        [Cocoa] Xcode cannot infer that the WebKit target implicitly depends on WebCore.framework
+        https://bugs.webkit.org/show_bug.cgi?id=133765
+
+        Reviewed by Anders Carlsson.
+
+        * Configurations/WebKit.xcconfig: Move linking against WebCore from OTHER_LDFLAGS here...
+        * WebKit2.xcodeproj/project.pbxproj: ...to the Link Binary With Libraries build phase here.
+
 2014-06-11  Timothy Horton  <[email protected]>
 
         [wk2] Don't dispatch view state changes immediately

Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (169845 => 169846)


--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig	2014-06-11 22:08:34 UTC (rev 169845)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig	2014-06-11 22:31:31 UTC (rev 169846)
@@ -38,9 +38,9 @@
 UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
 
 OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebKitLegacy -sub_umbrella WebKitLegacy;
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
 
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;

Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (169845 => 169846)


--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-06-11 22:08:34 UTC (rev 169845)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-06-11 22:31:31 UTC (rev 169846)
@@ -725,6 +725,7 @@
 		37A5E01418BBF93F000A081E /* _WKActivatedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		37A64E5518F38E3C00EB30F1 /* _WKFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5418F38E3C00EB30F1 /* _WKFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		37A64E5718F38F4600EB30F1 /* _WKFormInputSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
 		37BF2F061947DEB400723C48 /* WKNSURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 37BF2F041947DEB400723C48 /* WKNSURLRequest.h */; };
 		37BF2F071947DEB400723C48 /* WKNSURLRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37BF2F051947DEB400723C48 /* WKNSURLRequest.mm */; };
 		37C4C08618149C5B003688B9 /* WKBackForwardListItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */; };
@@ -3771,6 +3772,7 @@
 				3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
 				3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
 				37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
+				37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to