Avoid creating a temporary variable when target await expression is does not include...

[mono.git] / mcs / mcs / Makefile

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index 240e0da1b8123c6b6c205857339481ec9d041c0b..3524c5987d9896862c09405e77e8d3fffc573826 100644 (file)
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -12,9 +12,19 @@ EXTRA_DISTFILES = \
        TODO                    \
        ikvm.cs
 
-LOCAL_MCS_FLAGS += -d:STATIC
-PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/2.0
-PROGRAM = $(topdir)/class/lib/basic/mcs.exe
+ifeq (basic, $(PROFILE))
+PROGRAM = $(topdir)/class/lib/$(PROFILE)/basic.exe
+sourcefile = mcs.exe.sources
+else
+PROGRAM = $(topdir)/class/lib/build/mcs.exe
+LOCAL_MCS_FLAGS += -lib:$(topdir)/class/lib/build
+endif
+
+LOCAL_MCS_FLAGS += -d:STATIC,NO_SYMBOL_WRITER
+
+PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/4.0
+
+PROGRAM_COMPILE = $(BOOT_COMPILE)
 
 BUILT_SOURCES = cs-parser.cs
 
@@ -31,21 +41,14 @@ include ../build/executable.make
 
 csproj-local:
        config_file=`basename $(PROGRAM) .exe`-$(PROFILE).input; \
-       echo $(thisdir):$$config_file >> $(topdir)/../mono/msvc/scripts/order; \
+       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)/../mono/msvc/scripts/inputs/$$config_file
-       
-ifeq (basic, $(PROFILE))
-install-local:
-       $(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
-       $(INSTALL_BIN) $(PROGRAM) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
-       test ! -f $(PROGRAM).mdb || $(INSTALL_BIN) $(PROGRAM).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)
-endif
+       echo $(response)) > $(topdir)/../msvc/scripts/inputs/$$config_file
 
 #
 # Below this line we have local targets used for testing and development
@@ -70,10 +73,6 @@ mcs3.exe: mcs2.exe
 wc:
        wc -l $(BUILT_SOURCES) `cat $(sourcefile)`
 
-ctest: 
-       rm -f mcs2.exe mcs3.exe
-       $(MAKE) USE_MCS_FLAGS="-d:NET_1_1 -d:ONLY_1_1" btest
-
 # we need this because bash tries to use its own crappy timer
 FRIENDLY_TIME = $(shell which time) -f'%U seconds'