Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2016-01-28 02:08:20 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2016-01-28 02:08:20 +0300
commit41db6a54d3724a64275216da4f5f49da32af5b31 (patch)
treec3ab13fe8b576bebd7b1614de2531b66b2f471ae
parent180e745ccee4a80c9641a2e70235387e74b9eddb (diff)
parentc2ac146ca47be74cd2ac4ef15646b7bfe175e9a2 (diff)
Merge pull request #2526 from alexanderkyte/llvmonly_mobile_static_fixups
[mobile_static] Requested NunitLite comment and llvmonly configuration changes
-rw-r--r--mcs/build/profiles/mobile_static.make2
-rw-r--r--mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config6
2 files changed, 7 insertions, 1 deletions
diff --git a/mcs/build/profiles/mobile_static.make b/mcs/build/profiles/mobile_static.make
index 13e076a3081..f68e07be883 100644
--- a/mcs/build/profiles/mobile_static.make
+++ b/mcs/build/profiles/mobile_static.make
@@ -49,7 +49,7 @@ GSHAREDVT_FLAG = -O=gsharedvt
endif
ifeq ($(MONO_LLVMONLY),TRUE)
-AOT_BUILD_FLAGS_PREFIX = $(GSHAREDVT_FLAG) --aot=llvmonly,
+AOT_BUILD_FLAGS_PREFIX = --aot=llvmonly,
AOT_RUN_FLAGS = --llvmonly
else
AOT_BUILD_FLAGS_PREFIX = $(GSHAREDVT_FLAG) --aot=full,
diff --git a/mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config b/mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config
index 352f7249246..2ccc2b9ae68 100644
--- a/mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config
+++ b/mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<configuration>
<runtime>
+ <!--
+ This is necessary to prevent the runner from terminating on
+ any unhandled exceptions which occur. We account for unhandled exceptions on
+ other threads with an event handler, but would still be terminated using the
+ new behavior.
+ -->
<legacyUnhandledExceptionPolicy enabled="1" />
</runtime>
</configuration>