Fix mcs build to use Thread.Abort.
authorRolf Bjarne Kvinge <rolf@xamarin.com>
Thu, 19 Nov 2015 15:24:39 +0000 (16:24 +0100)
committerRolf Bjarne Kvinge <rolf@xamarin.com>
Thu, 19 Nov 2015 18:24:24 +0000 (19:24 +0100)
mcs/class/Mono.CSharp/Makefile
mcs/mcs/Makefile

index be27ecf831cb2e5bec4382db9b859225161c73e0..5fe1a18705aa43e4600800f4ed850a216c73066b 100644 (file)
@@ -11,7 +11,13 @@ ifdef MOBILE_STATIC
 LIB_MCS_FLAGS += -d:IOS_REFLECTION
 endif
 
+ifndef NO_THREAD_ABORT
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_ABORT
+endif
+
 TEST_MCS_FLAGS = -r:System.Core.dll
 
+LIB_MCS_FLAGS += $(REFERENCE_SOURCES_FLAGS)
+
 include ../../build/library.make
 
index 301ef3efc5a5f652cc787aefcb89a0ecc7ca7ca4..ef4f3e3c9172875db2711161333e38856f372bad 100644 (file)
@@ -26,6 +26,12 @@ endif
 
 LOCAL_MCS_FLAGS += -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE
 
+ifndef NO_THREAD_ABORT
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_ABORT
+endif
+
+LOCAL_MCS_FLAGS += $(REFERENCE_SOURCES_FLAGS)
+
 PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/4.5
 
 PROGRAM_COMPILE = $(BOOT_COMPILE)