merge 99630:99762

[mono.git] / mcs / build / rules.make

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 11f1267964c61aa2d810b1671e2edd5bce2d418c..226e4d4948caf777708c0072088d60deec6eec2a 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -101,6 +101,13 @@ else
 all: do-all
 endif
 
+ifdef NO_INSTALL
+GACUTIL = :
+else
+gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
+GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil) -bootstrap
+endif
+
 STD_TARGETS = test run-test run-test-ondotnet clean install uninstall
 
 $(STD_TARGETS): %: do-%