Merge remote-tracking branch 'upstream/master' into fix-for-issue2907-with-no-formatt...

[mono.git] / mcs / Makefile

diff --git a/mcs/Makefile b/mcs/Makefile
index 3472d349328699934f24d0b9ad67fb5399226e45..0c0f422fa5e09e97d1a5dda8c3cd0c3cd7236c3c 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -10,6 +10,7 @@ net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
 moonlight_raw_SUBDIRS := build class
 monodroid_SUBDIRS := build class
 monotouch_SUBDIRS := build class
+monotouch_runtime_SUBDIRS := build class
 mobile_SUBDIRS := build class
 net_3_5_SUBDIRS := build class tools/xbuild
 net_4_0_SUBDIRS := build class
@@ -81,7 +82,7 @@ all-local $(STD_TARGETS:=-local):
        @:
 
 dir-check:
-       @if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then echo "Running make from the mcs directory is not supported. Run make from the parent directory."; exit 1; fi
+       @if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then make -C ../runtime; fi
 
 # fun specialty targets
 
@@ -110,6 +111,7 @@ $(_boot_:%=profile-do--net_3_5--%):           profile-do--net_3_5--%:
 $(_boot_:%=profile-do--moonlight--%):         profile-do--moonlight--%:         profile-do--moonlight_raw--%
 $(_boot_:%=profile-do--monodroid--%):         profile-do--monodroid--%:         profile-do--build--%
 $(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--build--%
+$(_boot_:%=profile-do--monotouch_runtime--%):  profile-do--monotouch_runtime--%:  profile-do--build--%
 $(_boot_:%=profile-do--mobile--%):            profile-do--mobile--%:         profile-do--build--%
 $(_boot_:%=profile-do--moonlight_raw--%):     profile-do--moonlight_raw--%:     profile-do--build--%
 $(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--build--%