Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Work around -no_weak_imports issue with recent Xcode #36436

Merged
merged 1 commit into from
May 14, 2020
Merged

Work around -no_weak_imports issue with recent Xcode #36436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<_MonoCFLAGS Condition="'$(Platform)' == 'arm64'" Include="-arch arm64" />
<_MonoCFLAGS Include="-isysroot $(XcodeDir)/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS$(tvOSVersion).sdk" />
<_MonoCFLAGS Include="-mtvos-version-min=$(tvOSVersionMin)" />
<_MonoCFLAGS Include="-Werror=partial-availability" />
<_MonoCFLAGS Include="-Wl,-application_extension" />
<_MonoCFLAGS Include="-fexceptions" />
<_MonoCFLAGS Include="-fembed-bitcode" />
Expand All @@ -158,7 +159,7 @@
<_MonoCPPFLAGS Include="-DHAVE_LARGE_FILE_SUPPORT=1" />

<_MonoLDFLAGS Condition="'$(Platform)' == 'arm64'" Include="-arch arm64" />
<_MonoLDFLAGS Include="-Wl,-no_weak_imports" />
<!--<_MonoLDFLAGS Include="-Wl,-no_weak_imports" />--> <!-- TODO: reenable once Xcode bug is fixed: https://github.com/mono/mono/issues/19393 -->
<_MonoLDFLAGS Include="-Wl,-bitcode_bundle" />
<_MonoLDFLAGS Include="-framework CoreFoundation" />
<_MonoLDFLAGS Include="-lobjc" />
Expand Down Expand Up @@ -278,6 +279,7 @@
<_MonoCFLAGS Condition="'$(Platform)' == 'arm'" Include="-arch armv7s" />
<_MonoCFLAGS Include="-isysroot $(XcodeDir)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(iOSVersion).sdk" />
<_MonoCFLAGS Include="-miphoneos-version-min=$(iOSVersionMin)" />
<_MonoCFLAGS Include="-Werror=partial-availability" />
<_MonoCFLAGS Include="-Wl,-application_extension" />
<_MonoCFLAGS Include="-fexceptions" />

Expand All @@ -303,7 +305,7 @@
<_MonoLDFLAGS Condition="'$(Platform)' == 'arm64'" Include="-arch arm64" />
<_MonoLDFLAGS Condition="'$(Platform)' == 'arm'" Include="-arch armv7" />
<_MonoLDFLAGS Condition="'$(Platform)' == 'arm'" Include="-arch armv7s" />
<_MonoLDFLAGS Include="-Wl,-no_weak_imports" />
<!--<_MonoLDFLAGS Include="-Wl,-no_weak_imports" />--> <!-- TODO: reenable once Xcode bug is fixed: https://github.com/mono/mono/issues/19393 -->
<_MonoLDFLAGS Include="-framework CoreFoundation" />
<_MonoLDFLAGS Include="-lobjc" />
<_MonoLDFLAGS Include="-lc++" />
Expand Down