diff options
| author | Henric Müller <hemuller@microsoft.com> | 2016-12-22 16:34:55 +0300 |
|---|---|---|
| committer | Henric Müller <hemuller@microsoft.com> | 2017-01-25 12:14:01 +0300 |
| commit | ee048db72f867214ba2b9926d70a03badd79b33f (patch) | |
| tree | 5eff918b98614bb8304f6f0618f43feea3748bca /runtime | |
| parent | 96374a84a65d22f30782120044f48965daed3c49 (diff) | |
Updates for winaot profile
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 8e098579542..b540ee13f00 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -56,6 +56,10 @@ if INSTALL_TESTING_AOT_FULL build_profiles += testing_aot_full endif +if INSTALL_WINAOT +build_profiles += winaot +endif + if INSTALL_XAMMAC build_profiles += xammac xammac_net_4_5 endif @@ -117,20 +121,20 @@ cur_dir_cmd = pwd PLATFORM_PATH_SEPARATOR = : endif -if INSTALL_TESTING_AOT_FULL +if FULL_AOT_TESTS # ILASM.exe has features which a testing_aot_full runtime will not support. # It is invoked with an external mono when used in the runtime. # We skip it here because otherwise it will fail to verify. -TESTING_AOT_FULL_FILTER=grep -v ilasm +FULL_AOT_TESTS_FILTER=grep -v ilasm else -TESTING_AOT_FULL_FILTER=echo +FULL_AOT_TESTS_FILTER=echo 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 - export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(TESTING_AOT_FULL_FILTER)` ; \ + export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(FULL_AOT_TESTS_FILTER)` ; \ 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 \ |