diff options
author | Marek Safar <marek.safar@gmail.com> | 2016-11-30 17:38:21 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2017-01-02 20:51:40 +0300 |
commit | 9ea10965afd5cf50181d16930aca341bd1460e65 (patch) | |
tree | 2754e815e7d9fc8b539369b49c303dc1bfd8ac51 /mcs | |
parent | 7308137e43d976c50d7a211a1b4be4f5745d39c7 (diff) |
Roslyn 2.0 (rc2) upgrade
Diffstat (limited to 'mcs')
-rw-r--r-- | mcs/build/common/basic-profile-check.cs | 2 | ||||
-rw-r--r-- | mcs/class/aot-compiler/Makefile | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mcs/build/common/basic-profile-check.cs b/mcs/build/common/basic-profile-check.cs index 591843dd20e..88f326271ce 100644 --- a/mcs/build/common/basic-profile-check.cs +++ b/mcs/build/common/basic-profile-check.cs @@ -40,7 +40,7 @@ class X { if (!Version.TryParse (field.GetValue (null) as string, out version)) return 4; - if (version < new Version (4, 8)) + if (version < new Version (4, 9)) return 5; return 0; diff --git a/mcs/class/aot-compiler/Makefile b/mcs/class/aot-compiler/Makefile index 33634f366e4..505f91591ec 100644 --- a/mcs/class/aot-compiler/Makefile +++ b/mcs/class/aot-compiler/Makefile @@ -74,7 +74,8 @@ clean-local: # AOT build profile to speed up build ifeq ($(PROFILE),build) -IMAGES = $(mscorlib_aot_image) +# $(mscorlib_aot_image) is disabled due to runtime bug #50434 +IMAGES = ifdef MCS_MODE IMAGES += $(mcs_aot_image) |