Title: [231215] trunk/Source/WebKit
- Revision
- 231215
- Author
- [email protected]
- Date
- 2018-05-01 15:19:46 -0700 (Tue, 01 May 2018)
Log Message
Production build error in Migrate Header phase when WK_ALTERNATE_FRAMEWORKS_DIR is set to non-empty value
https://bugs.webkit.org/show_bug.cgi?id=185171
Reviewed by Timothy Hatcher.
* Configurations/BaseTarget.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (231214 => 231215)
--- trunk/Source/WebKit/ChangeLog 2018-05-01 22:03:52 UTC (rev 231214)
+++ trunk/Source/WebKit/ChangeLog 2018-05-01 22:19:46 UTC (rev 231215)
@@ -1,3 +1,12 @@
+2018-05-01 Jer Noble <[email protected]>
+
+ Production build error in Migrate Header phase when WK_ALTERNATE_FRAMEWORKS_DIR is set to non-empty value
+ https://bugs.webkit.org/show_bug.cgi?id=185171
+
+ Reviewed by Timothy Hatcher.
+
+ * Configurations/BaseTarget.xcconfig:
+
2018-05-01 Per Arne Vollan <[email protected]>
Use correct runloop type in the WebContent process.
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (231214 => 231215)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2018-05-01 22:03:52 UTC (rev 231214)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2018-05-01 22:19:46 UTC (rev 231215)
@@ -81,7 +81,7 @@
UMBRELLA_FRAMEWORKS_DIR_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
UMBRELLA_FRAMEWORKS_DIR_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
UMBRELLA_FRAMEWORKS_DIR_Production = $(UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
