macOS: Really fix target detection#11516
Closed
ryandesign wants to merge 1 commit intocurl:masterfrom
Closed
Conversation
ryandesign
commented
Jul 25, 2023
a3b3773 to
c81082f
Compare
ryandesign
commented
Jul 25, 2023
c81082f to
437c844
Compare
bagder
reviewed
Jul 25, 2023
Now SCDynamicStoreCopyProxies is called (and the required frameworks are linked in) on all versions of macOS and only on macOS. Fixes crash due to undefined symbol when built with the macOS 10.11 SDK or earlier. CURL_OSX_CALL_COPYPROXIES is renamed to CURL_MACOS_CALL_COPYPROXIES and is now only defined when SCDynamicStoreCopyProxies will actually be called. Previously, it was defined when ENABLE_IPV6 was not defined but SCDynamicStoreCopyProxies is not called in that case. TARGET_OS_OSX is only defined in the macOS 10.12 SDK and later and only when dynamic targets are enabled. TARGET_OS_MAC is always defined but means any Mac OS or derivative including macOS, iOS, tvOS, and watchOS. TARGET_OS_IPHONE means any Darwin OS other than macOS. Follow-up to c73b2f8 Closes curl#11502
437c844 to
2ee64d1
Compare
Contributor
Author
|
I believe I've addressed all the issues. Let me know if anything else needs to be changed. |
bagder
approved these changes
Jul 29, 2023
Member
|
Thanks! |
lyricidal
added a commit
to PRCYCoin/PRCYCoin
that referenced
this pull request
Aug 3, 2023
[will fail ->placeholder for release as we need curl/curl#11516 to fix our mac compile]
ptitSeb
pushed a commit
to wasix-org/curl
that referenced
this pull request
Sep 25, 2023
Now SCDynamicStoreCopyProxies is called (and the required frameworks are linked in) on all versions of macOS and only on macOS. Fixes crash due to undefined symbol when built with the macOS 10.11 SDK or earlier. CURL_OSX_CALL_COPYPROXIES is renamed to CURL_MACOS_CALL_COPYPROXIES and is now only defined when SCDynamicStoreCopyProxies will actually be called. Previously, it was defined when ENABLE_IPV6 was not defined but SCDynamicStoreCopyProxies is not called in that case. TARGET_OS_OSX is only defined in the macOS 10.12 SDK and later and only when dynamic targets are enabled. TARGET_OS_MAC is always defined but means any Mac OS or derivative including macOS, iOS, tvOS, and watchOS. TARGET_OS_IPHONE means any Darwin OS other than macOS. Follow-up to c73b2f8 Fixes curl#11502 Closes curl#11516
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
2 participants
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.
TARGET_OS_OSXis only defined in the macOS 10.12 SDK and later and is only defined when dynamic targets are enabled.TARGET_OS_MACis always defined but means any Darwin OS, including macOS, iOS, tvOS, watchOS.TARGET_OS_IPHONEmeans any Darwin OS other than macOS.Follow-up to c73b2f8
Closes #11502
I tested on macOS 12 building for OS X 10.8 and then for iOS 11.
And I tested on OS X 10.8 building for OS X 10.8 and then for iOS 7.