Merge pull request #2260 from xmcclure/fix-testwaitany

[mono.git] / mcs / class / Mono.CSharp / Makefile

diff --git a/mcs/class/Mono.CSharp/Makefile b/mcs/class/Mono.CSharp/Makefile
index 35ee0a302bc988447457c21c01aab18932af395e..5fe1a18705aa43e4600800f4ed850a216c73066b 100644 (file)
--- a/mcs/class/Mono.CSharp/Makefile
+++ b/mcs/class/Mono.CSharp/Makefile
@@ -4,15 +4,20 @@ include ../../build/rules.make
 
 LIBRARY = Mono.CSharp.dll
 
-LIB_MCS_FLAGS = -r:System.Core.dll -r:System.Xml.dll -r:System.dll
-
-MOBILE_STATIC := $(filter mobile_static monotouch, $(PROFILE))
+LIB_REFS = System.Core System.Xml System
+LIB_MCS_FLAGS =
 
 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