Title: [222293] trunk/Tools
- Revision
- 222293
- Author
- [email protected]
- Date
- 2017-09-20 15:08:29 -0700 (Wed, 20 Sep 2017)
Log Message
Device iOS 11 builds fail with FileProvider linker errors
https://bugs.webkit.org/show_bug.cgi?id=177272
<rdar://problem/34557680>
Reviewed by David Kilzer.
For iOS device and simulator, the SYSTEM_LIBRARY_DIR should never
be on the framework search path as neither platform should ever link
with Mac frameworks.
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (222292 => 222293)
--- trunk/Tools/ChangeLog 2017-09-20 22:03:06 UTC (rev 222292)
+++ trunk/Tools/ChangeLog 2017-09-20 22:08:29 UTC (rev 222293)
@@ -1,3 +1,18 @@
+2017-09-20 Jonathan Bedard <[email protected]>
+
+ Device iOS 11 builds fail with FileProvider linker errors
+ https://bugs.webkit.org/show_bug.cgi?id=177272
+ <rdar://problem/34557680>
+
+ Reviewed by David Kilzer.
+
+ For iOS device and simulator, the SYSTEM_LIBRARY_DIR should never
+ be on the framework search path as neither platform should ever link
+ with Mac frameworks.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+
2017-09-20 Alex Christensen <[email protected]>
Remove ActionType::InvalidAction
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (222292 => 222293)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2017-09-20 22:03:06 UTC (rev 222292)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2017-09-20 22:08:29 UTC (rev 222293)
@@ -37,7 +37,7 @@
WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
-FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
CLANG_CXX_LIBRARY = libc++;
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (222292 => 222293)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2017-09-20 22:03:06 UTC (rev 222292)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2017-09-20 22:08:29 UTC (rev 222293)
@@ -89,7 +89,8 @@
WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
