luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: fix taget detection

Browse Source 
- TARGET_OS_OSX is not always defined on macOS
- this leads to missing symbol Curl_macos_init()
- TargetConditionals.h seems to define these only when
  dynamic targets are enabled (somewhere?)
- this PR fixes that on my macOS 13.4.1
- I have no clue why CI builds worked without it

Follow-up to c7308592fb
Closes #11417
This commit is contained in:
Stefan Eissing 2023-07-10 09:39:19 +02:00 committed by Daniel Stenberg
parent c7308592fb
commit c73b2f8207
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/curl_setup.h
View File

@ -258,7 +258,7 @@
#if defined(__APPLE__) && !defined(USE_ARES) #if defined(__APPLE__) && !defined(USE_ARES)
#include <TargetConditionals.h> #include <TargetConditionals.h>
#define USE_RESOLVE_ON_IPS 1 #define USE_RESOLVE_ON_IPS 1
# if defined(TARGET_OS_OSX) && TARGET_OS_OSX # if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
# define CURL_OSX_CALL_COPYPROXIES 1 # define CURL_OSX_CALL_COPYPROXIES 1
# endif # endif
#endif #endif

2
lib/macos.c
View File

@ -26,7 +26,7 @@
#if defined(__APPLE__) #if defined(__APPLE__)
#if defined(TARGET_OS_OSX) && TARGET_OS_OSX #if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
#include <curl/curl.h> #include <curl/curl.h>

2
lib/macos.h
View File

@ -25,7 +25,7 @@
***************************************************************************/ ***************************************************************************/
#include "curl_setup.h" #include "curl_setup.h"
#if defined(__APPLE__) && defined(TARGET_OS_OSX) && TARGET_OS_OSX #if defined(__APPLE__) && (!defined(TARGET_OS_OSX) || TARGET_OS_OSX)
CURLcode Curl_macos_init(void); CURLcode Curl_macos_init(void);