Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Canciani <ranma42@gmail.com>2014-04-24 00:53:14 +0400
committerAndrea Canciani <ranma42@gmail.com>2014-04-24 00:53:14 +0400
commite3592a00915061f77f3e9a061236b956e055c5ec (patch)
tree22fadff08eb51b4036d3e2a873634ba6f69f3405 /runtime
parent1a15d4ec541eaf20ed78eac53149b1b83e1450fe (diff)
Fix 'make check' when mono is not installed
When the xbuild_12 profile is verified, the corlib from the net_4_5 profile should be in the MONO_PATH, otherwise the verification will fail with: The assembly mscorlib.dll was not found or could not be loaded. It should have been installed in the `.../mono/4.5/mscorlib.dll' directory.
Diffstat (limited to 'runtime')
-rw-r--r--runtime/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 9e8160baea9..aee421e42a5 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -136,6 +136,8 @@ mcs-compileall: mono-wrapper etc/mono/config
fi; \
if [ "net_3_5" = "$$profile" ]; then \
MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
+ elif [ "xbuild_12" = "$$profile" ]; then \
+ MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
else \
MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
fi; \