projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #656 from LogosBible/collection_lock
[mono.git]
/
mcs
/
class
/
System.Core
/
Makefile
diff --git
a/mcs/class/System.Core/Makefile
b/mcs/class/System.Core/Makefile
index 934c3f3cb604938c6b8f35fa7dc982237ba8b639..431eed840efe6382e5e2f709d40591f03b409862 100644
(file)
--- a/
mcs/class/System.Core/Makefile
+++ b/
mcs/class/System.Core/Makefile
@@
-21,7
+21,7
@@
ifeq (xammac, $(PROFILE))
LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT
endif
LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT
endif
-ifeq (monotouch, $(
PROFILE
))
+ifeq (monotouch, $(
subst _runtime,,$(PROFILE)
))
LIBRARY_USE_INTERMEDIATE_FILE = yes
CYCLIC_DEPS := $(INTERPRETER_DEP)
LIBRARY_USE_INTERMEDIATE_FILE = yes
CYCLIC_DEPS := $(INTERPRETER_DEP)
@@
-37,6
+37,10
@@
endif
endif
endif
+ifeq (monotouch_runtime, $(PROFILE))
+LIB_MCS_FLAGS += -d:FULL_AOT_RUNTIME
+endif
+
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT,FEATURE_PDBEMIT
endif
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT,FEATURE_PDBEMIT
endif
@@
-54,6
+58,7
@@
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
include ../../build/library.make
ifdef CYCLIC_DEP_FILES
include ../../build/library.make
ifdef CYCLIC_DEP_FILES
+TEST_HARNESS_EXCLUDES += -exclude:NotWorkingInterpreter
$(build_lib): $(INTERPRETER_DEP_FILE)
endif
$(build_lib): $(INTERPRETER_DEP_FILE)
endif