diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-11-24 04:33:29 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-11-24 19:40:54 +0300 |
| commit | 9f5b8c4cf2b7980ea5dddef62b36bb1910b53ff9 (patch) | |
| tree | 7db8aa9f98bd8a5c1242194d660ae84ee630bcce /runtime | |
| parent | 1d6abe9ecaa51d39c01a9e4070e8bdd15b61593f (diff) | |
Rename the mobile_static profile to aot_only
We decided it's a better name since we're using the profile to
test FullAOT scenarios on desktop (as opposed to the mobile profiles).
While doing the rename I saw that a lot of the #ifdefs were using
MOBILE_STATIC even though the code should actually be included/excluded
in all FullAOT scenarios, e.g. System.Reflection.Emit. I replaced those
cases with FULL_AOT_RUNTIME instead.
For cases where code is specific to this profile, I added a new
AOT_ONLY_DESKTOP define.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 3234eb2099a..1fe237bc345 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -52,8 +52,8 @@ if INSTALL_AOT_HYBRID build_profiles += aot_hybrid endif -if INSTALL_MOBILE_STATIC -build_profiles += mobile_static +if INSTALL_AOT_ONLY +build_profiles += aot_only endif if INSTALL_XAMMAC @@ -113,20 +113,20 @@ cur_dir_cmd = pwd PLATFORM_PATH_SEPARATOR = : endif -if INSTALL_MOBILE_STATIC -# ILASM.exe has features which a mobile_static runtime will not support. +if INSTALL_AOT_ONLY +# ILASM.exe has features which a aot_only 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. -MOBILE_STATIC_FILTER=grep -v ilasm +AOT_ONLY_FILTER=grep -v ilasm else -MOBILE_STATIC_FILTER=echo +AOT_ONLY_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)$$' | $(MOBILE_STATIC_FILTER)` ; \ + export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(AOT_ONLY_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 \ |