Merge pull request #2631 from ludovic-henry/fix-microsoftbuild

[mono.git] / mcs / mcs / Makefile

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index c3447ffbf5738590081769a9ba4995a070ce5732..8b93d720fa1dca32835d6eb4b0480b222eb91bac 100644 (file)
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -8,13 +8,11 @@ include ../build/rules.make
 
 EXTRA_DISTFILES = \
        mcs.csproj              \
-       compiler.doc            \
        mcs.sln         \
        cs-parser.jay           \
-       mcs.exe.sources         \
-       NOTES                   \
-       TODO                    \
-       ikvm.cs
+       mcs.exe.sources
+
+LIB_REFS = System System.Core System.Xml
 
 ifeq (basic, $(PROFILE))
 PROGRAM = basic.exe
@@ -26,7 +24,17 @@ the_libdir = $(topdir)/class/lib/build/
 LOCAL_MCS_FLAGS += -lib:$(topdir)/class/lib/build -debug
 endif
 
-LOCAL_MCS_FLAGS += -d:STATIC,NO_SYMBOL_WRITER
+LOCAL_MCS_FLAGS += -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE
+
+ifndef NO_THREAD_ABORT
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_ABORT
+endif
+
+ifndef NO_PROCESS_START
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START
+endif
+
+LOCAL_MCS_FLAGS += $(REFERENCE_SOURCES_FLAGS)
 
 PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/4.5
 
@@ -43,17 +51,6 @@ KEEP_OUTPUT_FILE_COPY = yes
 
 include ../build/executable.make
 
-csproj-local:
-       config_file=`basename $(PROGRAM) .exe`-$(PROFILE).input; \
-       echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
-       (echo $(is_boot); \
-       echo $(BOOTSTRAP_MCS);  \
-       echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
-       echo $(PROGRAM); \
-       echo $(BUILT_SOURCES); \
-       echo $(PROGRAM); \
-       echo $(response)) > $(topdir)/../msvc/scripts/inputs/$$config_file
-
 #
 # Below this line we have local targets used for testing and development
 #
@@ -103,6 +100,7 @@ profile : $(PROGRAM)
        $(RUNTIME) $(RUNTIME_FLAGS) --profile=$(PROFILER) $(PROGRAM) $(USE_MCS_FLAGS) -target:exe -out:mcs2.exe $(BUILT_SOURCES) @$(response)
 
 debug-parser:
+       rm cs-parser.cs
        $(MAKE) JAY_FLAGS=-cvt
 
 #