File tree Expand file tree Collapse file tree 3 files changed +19
-3
lines changed
Expand file tree Collapse file tree 3 files changed +19
-3
lines changed Original file line number Diff line number Diff line change @@ -67,6 +67,9 @@ _ios-$(1)_AC_VARS= \
6767 ac_cv_func_futimens=no \
6868 ac_cv_func_utimensat=no \
6969 ac_cv_func_shm_open_working_with_mmap=no \
70+ ac_cv_func_pthread_jit_write_protect_np=no \
71+ ac_cv_func_preadv=no \
72+ ac_cv_func_pwritev=no \
7073 mono_cv_sizeof_sunpath=104 \
7174 mono_cv_uscore=yes
7275
@@ -90,11 +93,15 @@ _ios-$(1)_CPPFLAGS= \
9093 -DSMALL_CONFIG -D_XOPEN_SOURCE -DHOST_IOS -DHAVE_LARGE_FILE_SUPPORT=1 \
9194
9295_ios-$(1 ) _LDFLAGS= \
93- -Wl,-no_weak_imports \
9496 -arch $(3 ) \
9597 -framework CoreFoundation \
9698 -lobjc -lc++
9799
100+ # Xcode 12 and later cause issues with no_weak_imports: https://github.com/mono/mono/issues/19393
101+ ifeq ($(XCODE_MAJOR_VERSION ) ,$(filter $(XCODE_MAJOR_VERSION ) , 11 10 9) )
102+ _ios-$(1)_LDFLAGS += -Wl,-no_weak_imports
103+ endif
104+
98105_ios-$(1 ) _CONFIGURE_FLAGS = \
99106 --disable-boehm \
100107 --disable-btls \
@@ -296,6 +303,9 @@ _ios-$(1)_AC_VARS= \
296303 ac_cv_func_futimens=no \
297304 ac_cv_func_utimensat=no \
298305 ac_cv_func_shm_open_working_with_mmap=no \
306+ ac_cv_func_pthread_jit_write_protect_np=no \
307+ ac_cv_func_preadv=no \
308+ ac_cv_func_pwritev=no \
299309 mono_cv_uscore=yes
300310
301311_ios-$(1 ) _CFLAGS= \
Original file line number Diff line number Diff line change @@ -36,8 +36,12 @@ _mac-$(1)_CXXFLAGS= \
3636
3737_mac-$(1 ) _CPPFLAGS=
3838
39- _mac-$(1 ) _LDFLAGS= \
40- -Wl,-no_weak_imports
39+ _mac-$(1 ) _LDFLAGS=
40+
41+ # Xcode 12 and later cause issues with no_weak_imports: https://github.com/mono/mono/issues/19393
42+ ifeq ($(XCODE_MAJOR_VERSION ) ,$(filter $(XCODE_MAJOR_VERSION ) , 11 10 9) )
43+ _mac-$(1)_LDFLAGS += -Wl,-no_weak_imports
44+ endif
4145
4246_mac-$(1 ) _CONFIGURE_FLAGS= \
4347 --disable-boehm \
Original file line number Diff line number Diff line change @@ -20,6 +20,8 @@ ANDROID_SDK_VERSION_x86_64?=21
2020# iOS
2121
2222XCODE_DIR? =/Applications/Xcode.app/Contents/Developer
23+ XCODE_VERSION: =$(shell /usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" $(XCODE_DIR ) /../version.plist)
24+ XCODE_MAJOR_VERSION: =$(word 1, $(subst ., ,$(XCODE_VERSION ) ) )
2325
2426# min versions of the targets
2527MACOS_VERSION_MIN? =10.9
You can’t perform that action at this time.
0 commit comments