diff --git a/Make.config b/Make.config index 7c533b7b89bf..279c22b69e1a 100644 --- a/Make.config +++ b/Make.config @@ -768,6 +768,7 @@ DOTNET_PLATFORMS= ifdef INCLUDE_IOS ifdef ENABLE_DOTNET DOTNET_PLATFORMS+=iOS +DOTNET_CORECLR_PLATFORMS+=iOS DOTNET_MONOVM_PLATFORMS+=iOS DOTNET_IOS_BITNESSES+=64 DOTNET_NATIVEAOT_PLATFORMS+=iOS @@ -795,6 +796,7 @@ endif # INCLUDE_IOS ifdef INCLUDE_TVOS ifdef ENABLE_DOTNET DOTNET_PLATFORMS+=tvOS +DOTNET_CORECLR_PLATFORMS+=tvOS DOTNET_MONOVM_PLATFORMS+=tvOS DOTNET_TVOS_BITNESSES+=64 DOTNET_NATIVEAOT_PLATFORMS+=tvOS @@ -810,6 +812,7 @@ endif ifdef INCLUDE_MACCATALYST ifdef ENABLE_DOTNET DOTNET_PLATFORMS+=MacCatalyst +DOTNET_CORECLR_PLATFORMS+=MacCatalyst DOTNET_MONOVM_PLATFORMS+=MacCatalyst DOTNET_MACCATALYST_BITNESSES+=64 DOTNET_NATIVEAOT_PLATFORMS+=MacCatalyst diff --git a/builds/package-download/download-packages.csproj b/builds/package-download/download-packages.csproj index 324bca4ef38e..059be01ad4fb 100644 --- a/builds/package-download/download-packages.csproj +++ b/builds/package-download/download-packages.csproj @@ -26,6 +26,16 @@ + + + + + + + + + + diff --git a/runtime/Makefile b/runtime/Makefile index 5c197c474635..3285d1974111 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -614,11 +614,16 @@ $(foreach platform,$(DOTNET_NATIVEAOT_PLATFORMS),$(foreach rid,$(DOTNET_$(platfo # a few lookup tables, because the data we have is not always in the format we need it DOTNET_iphonesimulator_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit +DOTNET_iphonesimulator_CORECLR_DYLIB_FLAGS=-lcoreclr DOTNET_iphoneos_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit +DOTNET_iphoneos_CORECLR_DYLIB_FLAGS=-lcoreclr DOTNET_tvsimulator_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit +DOTNET_tvsimulator_CORECLR_DYLIB_FLAGS=-lcoreclr DOTNET_tvos_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit +DOTNET_tvos_CORECLR_DYLIB_FLAGS=-lcoreclr DOTNET_maccatalyst_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit -DOTNET_mac_DYLIB_FLAGS=-lcoreclr +DOTNET_maccatalyst_CORECLR_DYLIB_FLAGS=-lcoreclr +DOTNET_mac_CORECLR_DYLIB_FLAGS=-lcoreclr # # DotNetInstallLibTemplate lipos or copies libraries into the destination directories @@ -675,7 +680,7 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIM define DotNetLibXamarinTemplate DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/packages/microsoft.netcore.app.runtime$(7).$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native -DOTNET$(6)_$(2)_DYLIB_FLAGS = $(DOTNET_$(1)_DYLIB_FLAGS) -Wl,-install_name,libxamarin$(5).dylib -framework Foundation -framework CFNetwork -lz -L$(abspath $(DOTNET$(6)_$(2)_LIBDIR)) +DOTNET$(6)_$(2)_DYLIB_FLAGS = $(DOTNET_$(1)$(6)_DYLIB_FLAGS) -Wl,-install_name,libxamarin$(5).dylib -framework Foundation -framework CFNetwork -lz -L$(abspath $(DOTNET$(6)_$(2)_LIBDIR)) DOTNET_$(2)_$(3)$(4)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(5).$(3).o, $(MONOTOUCH_SOURCE_STEMS)) $$(patsubst %,.libs/$(1)/%$(5).$(3).o, $(MONOTOUCH_$(shell echo $(3) | tr a-z A-Z)_SOURCE_STEMS))