Title: [274742] trunk/Source/ThirdParty/ANGLE
- Revision
- 274742
- Author
- [email protected]
- Date
- 2021-03-19 15:19:14 -0700 (Fri, 19 Mar 2021)
Log Message
libANGLE-shared.dylib needs INSTALL_PATH when building Catalyst roots
https://bugs.webkit.org/show_bug.cgi?id=223499
Reviewed by Dean Jackson.
INSTALL_PATH was empty, so no dylib was being included in the root.
This is needed to fix the Catalyst build after bug 218539
* Configurations/ANGLE-dynamic.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (274741 => 274742)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-03-19 22:12:47 UTC (rev 274741)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-03-19 22:19:14 UTC (rev 274742)
@@ -1,3 +1,15 @@
+2021-03-19 Alex Christensen <[email protected]>
+
+ libANGLE-shared.dylib needs INSTALL_PATH when building Catalyst roots
+ https://bugs.webkit.org/show_bug.cgi?id=223499
+
+ Reviewed by Dean Jackson.
+
+ INSTALL_PATH was empty, so no dylib was being included in the root.
+ This is needed to fix the Catalyst build after bug 218539
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
2021-03-06 Dean Jackson <[email protected]>
Metal-ANGLE can ASSERT because MTL signal event code is compiled out
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (274741 => 274742)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-03-19 22:12:47 UTC (rev 274741)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-03-19 22:19:14 UTC (rev 274742)
@@ -19,7 +19,7 @@
INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
-INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
