diff options
| author | Ludovic Henry <ludovic@xamarin.com> | 2016-11-18 23:58:03 +0300 |
|---|---|---|
| committer | Ludovic Henry <ludovic@xamarin.com> | 2016-11-22 18:32:15 +0300 |
| commit | d8693e0c73388503c06ebc009b753ef1488924af (patch) | |
| tree | 0041a26e12d03e47b79a59d8bd2ad62f1bad93c8 /mcs/class/Makefile | |
| parent | f1decc325fedc338edc64ed87b860cedb91d3ad8 (diff) | |
[profiles] Fix MOBILE assemblies and tests compilation + Rename MOBILE to AOT_HYBRID
This only fixes the compilation of the assemblies and the tests. This doesn't fix the failing tests or the crashes.
Diffstat (limited to 'mcs/class/Makefile')
| -rw-r--r-- | mcs/class/Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 714033a4eb1..f22bc600ec3 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -69,17 +69,23 @@ mobile_static_dirs := \ Mono.Simd \ $(pcl_facade_dirs) -mobile_dynamic_dirs := \ +aot_hybrid_dirs := \ $(mobile_common_dirs) \ + PEAPI \ Mono.CompilerServices.SymbolWriter \ + Mono.Simd \ $(pcl_facade_dirs) xammac_dirs := \ - $(mobile_dynamic_dirs) + $(mobile_common_dirs) \ + Mono.CompilerServices.SymbolWriter \ + $(pcl_facade_dirs) monodroid_dirs := \ - $(mobile_dynamic_dirs) \ - Mono.Btls.Interface + $(mobile_common_dirs) \ + Mono.CompilerServices.SymbolWriter \ + Mono.Btls.Interface \ + $(pcl_facade_dirs) monotouch_dirs := \ $(mobile_static_dirs) @@ -308,7 +314,7 @@ monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs) monotouch_watch_runtime_SUBDIRS := $(monotouch_watch_runtime_dirs) monotouch_tv_runtime_SUBDIRS := $(monotouch_tv_runtime_dirs) mobile_static_SUBDIRS := $(mobile_static_dirs) -mobile_SUBDIRS := $(mobile_dynamic_dirs) +aot_hybrid_SUBDIRS := $(aot_hybrid_dirs) xammac_SUBDIRS := $(xammac_dirs) xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs) binary_reference_assemblies_SUBDIRS := reference-assemblies @@ -319,7 +325,7 @@ xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks include ../build/rules.make -SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS) +SUBDIRS = $(mobile_static_dirs) $(aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS) DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks |