diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-10-05 03:37:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 03:37:24 +0300 |
| commit | b2a11ac756f940c30b05aa0a8baf733572df4ce5 (patch) | |
| tree | f53154891304ce1bae679fcd5617c57aa2d85fc1 /runtime | |
| parent | f77270c633c1e5a1703207cb96f1934a7354c0bc (diff) | |
Add new profile for monodroid tools (#5699)
* Add new profile for monodroid tools
This allows the XA build to use these instead of needing to build net_4_x.
We build the assemblies against the .NET 4.6 reference assemblies.
* Skip monodroid_tools in verify (aka mcs-compileall)
Exclude it from the test_profiles since running tests makes no sense there.
Also refactor to exclude binary_reference_assemblies as well,
it was already excluded manually in mcs-compileall before.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 326158c3af8..2cd119314fe 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -33,7 +33,7 @@ net_profile = net_4_x endif if INSTALL_MONODROID -build_profiles += monodroid +build_profiles += monodroid monodroid_tools endif if INSTALL_MONOTOUCH @@ -72,7 +72,7 @@ if INSTALL_UNREAL build_profiles += unreal endif -test_profiles = $(build_profiles) +test_profiles = $(filter-out binary_reference_assemblies monodroid_tools,$(build_profiles)) if BUILD_MCS @@ -142,13 +142,10 @@ endif # Compile all assemblies with the verifier turned on. Code must be valid but not verifiable. # TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode. -# Skip binary_reference_assemblies because they contain metadata only mcs-compileall: mono-wrapper etc/mono/config save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \ for profile in $(test_profiles); do \ - if [ "binary_reference_assemblies" = "$$profile" ]; then \ - continue; \ - elif [ "xbuild_12" = "$$profile" ]; then \ + if [ "xbuild_12" = "$$profile" ]; then \ MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_x$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \ elif [ "xbuild_14" = "$$profile" ]; then \ MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_x$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \ |