From 430e9d64f731e4d2d19672e00531d173e0282e98 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Thu, 1 Dec 2016 23:53:29 +0100 Subject: [PATCH] [build] Put back mcs to monolite to support boostrap with mcs only --- mcs/Makefile | 4 ++-- mcs/class/Makefile | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mcs/Makefile b/mcs/Makefile index c2f9a1a6097..6f9d02f5e8f 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 class -build_SUBDIRS := build jay class class/aot-compiler tools +basic_SUBDIRS := build jay mcs class +build_SUBDIRS := build 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 e2b290dba20..5dc02e491be 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -372,6 +372,7 @@ 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) @@ -405,10 +406,13 @@ $(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) +dist-monolite: $(monolite_files) lib/$(monolite_dir)/mcs.exe dist-default: dist-monolite -- 2.25.1