Changeset 279925 in webkit

Timestamp:

Jul 14, 2021 3:12:05 PM (3 years ago)

Author:

achristensen@apple.com

Message:

Link against Catalyst ANGLE-shared.dylib when linking Catalyst WebCore.framework
​https://bugs.webkit.org/show_bug.cgi?id=227965
<rdar://76284889>

Reviewed by Tim Horton.

r274742 put the dylib into the correct location, but when linking WebCore we are still looking in the
location of the non-Catalyst dylib, which happens to have all the symbols we are looking for so linking succeeds.
At runtime, though, we realize we are opening the wrong dylib and bad things happen.

The solution is to look in the Catalyst WebCore framework directory when WK_USE_ALTERNATE_FRAMEWORKS_DIR is YES,
which is only in the Catalyst build.

• Configurations/WebCore.xcconfig:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebCore.xcconfig (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-14  Alex Christensen  <achristensen@webkit.org>
+
+        Link against Catalyst ANGLE-shared.dylib when linking Catalyst WebCore.framework
+        https://bugs.webkit.org/show_bug.cgi?id=227965
+        <rdar://76284889>
+
+        Reviewed by Tim Horton.
+
+        r274742 put the dylib into the correct location, but when linking WebCore we are still looking in the
+        location of the non-Catalyst dylib, which happens to have all the symbols we are looking for so linking succeeds.
+        At runtime, though, we realize we are opening the wrong dylib and bad things happen.
+
+        The solution is to look in the Catalyst WebCore framework directory when WK_USE_ALTERNATE_FRAMEWORKS_DIR is YES,
+        which is only in the Catalyst build.
+
+        * Configurations/WebCore.xcconfig:
+
 2021-07-14  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/Configurations/WebCore.xcconfig

@@ -42 +42 @@
 
 WK_FRAMEWORKS_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks
-WK_FRAMEWORKS_LIBRARY_DIR[sdk=macosx*] = $(WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+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_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;
 
 LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_FRAMEWORKS_LIBRARY_DIR)";