From e3e699f3211bf4ce5e0e28f8eb68734b4babe1bc Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 1 Dec 2016 21:09:47 -0500 Subject: [PATCH] Revert "[build] Put back mcs to monolite to support boostrap with mcs only" This reverts commit 430e9d64f731e4d2d19672e00531d173e0282e98. Revert this as it seems to break the build: https://wrench.internalx.com/Wrench/ViewLane.aspx?lane_id=2457&host_id=148&revision_id=834314 --- mcs/Makefile | 4 ++-- mcs/class/Makefile | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mcs/Makefile b/mcs/Makefile index 6f9d02f5e8f..c2f9a1a6097 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -4,8 +4,8 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs packages # Resgen is corlib specific tool -basic_SUBDIRS := build jay mcs class -build_SUBDIRS := build class class/aot-compiler tools +basic_SUBDIRS := build class +build_SUBDIRS := build jay class class/aot-compiler tools monodroid_SUBDIRS := build class monotouch_SUBDIRS := build class monotouch_watch_SUBDIRS := build class diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 5dc02e491be..e2b290dba20 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -372,7 +372,6 @@ DISTFILES = \ MicrosoftAjaxLibrary/License.htm \ test-helpers/NetworkHelpers.cs \ test-helpers/SocketResponder.cs \ - lib/$(monolite_dir)/mcs.exe \ $(monolite_files) .PHONY: all-local $(STD_TARGETS:=-local) @@ -406,13 +405,10 @@ $(monolite_files): | lib/$(monolite_dir)/Facades $(monolite_files): lib/$(monolite_dir)/%: lib/build/% cp -p $< $@ -lib/$(monolite_dir)/mcs.exe: - cp -p lib/basic/mcs.exe lib/$(monolite_dir) - $(build_files:%=lib/build/%): cd $(topdir) && $(MAKE) profile-do--build--all NO_DIR_CHECK=1 SKIP_AOT=1 -dist-monolite: $(monolite_files) lib/$(monolite_dir)/mcs.exe +dist-monolite: $(monolite_files) dist-default: dist-monolite -- 2.25.1