Title: [183884] trunk/Tools
- Revision
- 183884
- Author
- [email protected]
- Date
- 2015-05-06 13:34:51 -0700 (Wed, 06 May 2015)
Log Message
Do not link tools to WebKit2.framework
https://bugs.webkit.org/show_bug.cgi?id=144699
Unreviewed build fix.
* TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
* WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
These linked to WebKit2 in two ways, eliminating the other one.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (183883 => 183884)
--- trunk/Tools/ChangeLog 2015-05-06 20:32:42 UTC (rev 183883)
+++ trunk/Tools/ChangeLog 2015-05-06 20:34:51 UTC (rev 183884)
@@ -1,3 +1,14 @@
+2015-05-06 Alexey Proskuryakov <[email protected]>
+
+ Do not link tools to WebKit2.framework
+ https://bugs.webkit.org/show_bug.cgi?id=144699
+
+ Unreviewed build fix.
+
+ * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
+ * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
+ These linked to WebKit2 in two ways, eliminating the other one.
+
2015-05-05 Myles C. Maxfield <[email protected]>
Introducing the Platform Abstraction Layer (PAL)
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (183883 => 183884)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2015-05-06 20:32:42 UTC (rev 183883)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2015-05-06 20:34:51 UTC (rev 183884)
@@ -25,7 +25,7 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZN7testing4Test16TearDownTestCaseEv -Wl,-unexported_symbol -Wl,__ZN7testing4Test13SetUpTestCaseEv
-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework _javascript_Core -framework WebKit -framework WebKit2 $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework _javascript_Core -framework WebKit $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_macosx = -framework Cocoa -framework Carbon;
// FIXME: This should not be built on iOS. Instead we should create and use a TestWebKitAPI application.
Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig (183883 => 183884)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2015-05-06 20:32:42 UTC (rev 183883)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2015-05-06 20:34:51 UTC (rev 183884)
@@ -26,7 +26,7 @@
PRODUCT_NAME = WebKitTestRunner
GCC_ENABLE_OBJC_EXCEPTIONS = YES
-OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework WebKit2;
+OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY);
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = -framework _javascript_Core -framework CoreGraphics -framework ImageIO -framework UIKit;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
