Fix zlib OS_CODE misidentification on non-macOS Apple platforms #6269
Open
lilinxiong wants to merge 1 commit intogoogle-ai-edge:masterfrom
Open
Fix zlib OS_CODE misidentification on non-macOS Apple platforms #6269lilinxiong wants to merge 1 commit intogoogle-ai-edge:masterfrom
lilinxiong wants to merge 1 commit intogoogle-ai-edge:masterfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
zutil.hpatch inthird_party/zlib.diffcurrently checksdefined(MACOS) || defined(TARGET_OS_MAC)to setOS_CODEto 7 (Macintosh). However,TARGET_OS_MACis defined as 1 for all Appleplatforms (macOS, iOS, tvOS, watchOS, visionOS) in the Apple SDK headers, not just macOS.
This causes iOS and other non-macOS Apple platform builds to incorrectly use
OS_CODE 7and pull in classic Mac-specific code paths (e.g.,macopen()via__MWERKS__checks), which are not appropriate forthese platforms.
This change removes the
TARGET_OS_MACcheck, keeping onlydefined(MACOS)which correctly targets classic Mac OS only.