Title: [293794] trunk/Source/WebCore
- Revision
- 293794
- Author
- [email protected]
- Date
- 2022-05-04 14:55:48 -0700 (Wed, 04 May 2022)
Log Message
[Mac] WebCore should search system content path for nested Frameworks
https://bugs.webkit.org/show_bug.cgi?id=240063
Reviewed by Alexey Proskuryakov.
Changed nested frameworks directory to be below where WebCore will be installed
when building with the system content path.
* Configurations/WebCore.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (293793 => 293794)
--- trunk/Source/WebCore/ChangeLog 2022-05-04 21:23:48 UTC (rev 293793)
+++ trunk/Source/WebCore/ChangeLog 2022-05-04 21:55:48 UTC (rev 293794)
@@ -1,3 +1,15 @@
+2022-05-04 Michael Saboff <[email protected]>
+
+ [Mac] WebCore should search system content path for nested Frameworks
+ https://bugs.webkit.org/show_bug.cgi?id=240063
+
+ Reviewed by Alexey Proskuryakov.
+
+ Changed nested frameworks directory to be below where WebCore will be installed
+ when building with the system content path.
+
+ * Configurations/WebCore.xcconfig:
+
2022-05-04 Kate Cheney <[email protected]>
REGRESSION (r293427): [ iOS ] http/tests/quicklook/same-origin-xmlhttprequest-allowed.html is a constant crash and failure (240024)
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (293793 => 293794)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-05-04 21:23:48 UTC (rev 293793)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-05-04 21:55:48 UTC (rev 293794)
@@ -61,9 +61,9 @@
WK_FRAMEWORKS_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks
WK_FRAMEWORKS_LIBRARY_DIR[sdk=macosx*] = $(WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR))
WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
+WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_PREFIX)$(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
-WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
+WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_FRAMEWORKS_LIBRARY_DIR)";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
