Bug 240063 – [Mac] WebCore should search system content path for nested Frameworks

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Michael Saboff]

We building with the system content path, we should search there for the WebCore nested frameworks instead of the symlinked location.

[Michael Saboff]

<rdar://92426000>

[Michael Saboff]

Created attachment 458791 [details]
Patch

[Elliott Williams]

Comment on attachment 458791 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=458791&action=review

r=me

> Source/WebCore/Configurations/WebCore.xcconfig:66
>  WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;

Do we want $(INSTALL_PATH_PREFIX) here too? I believe this path is used for catalyst builds, where WK_ALTERNATE_FRAMEWORKS_DIR = /System/iOSSupport.

[Alexey Proskuryakov]

Comment on attachment 458791 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=458791&action=review

>> Source/WebCore/Configurations/WebCore.xcconfig:66
>>  WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
> 
> Do we want $(INSTALL_PATH_PREFIX) here too? I believe this path is used for catalyst builds, where WK_ALTERNATE_FRAMEWORKS_DIR = /System/iOSSupport.

Great catch, I think that we need the same change for macCatalyst too. Surprised that building with the patch didn't fail macCatalyst build.

[Michael Saboff]

(In reply to Alexey Proskuryakov from comment #4)
> Comment on attachment 458791 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=458791&action=review
> 
> >> Source/WebCore/Configurations/WebCore.xcconfig:66
> >>  WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
> > 
> > Do we want $(INSTALL_PATH_PREFIX) here too? I believe this path is used for catalyst builds, where WK_ALTERNATE_FRAMEWORKS_DIR = /System/iOSSupport.
> 
> Great catch, I think that we need the same change for macCatalyst too.
> Surprised that building with the patch didn't fail macCatalyst build.

Added.  Running a local macCatalyst build to verify.

[Michael Saboff]

Created attachment 458814 [details]
Patch for Landing

[EWS]

Committed r293794 (250268@main): <https://commits.webkit.org/250268@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 458814 [details].