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:
authorMarek Habersack <grendel@twistedcode.net>2011-02-08 22:41:09 +0300
committerMarek Habersack <grendel@twistedcode.net>2011-02-08 22:44:25 +0300
commit90f74ba8f2b3f926f023b9e1ed84bb332f991593 (patch)
tree8708c12d0920d8cda1ad7c51405a6ac66333998f /mcs/class/aot-compiler
parent4ad5f42e11b59e0b90082d8b4f0e08297aef82a6 (diff)
[aot compiler] runtime_dep uses the correct path when cross-compiling
Diffstat (limited to 'mcs/class/aot-compiler')
-rw-r--r--mcs/class/aot-compiler/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/mcs/class/aot-compiler/Makefile b/mcs/class/aot-compiler/Makefile
index af1e707150c..eaaf62c6bf1 100644
--- a/mcs/class/aot-compiler/Makefile
+++ b/mcs/class/aot-compiler/Makefile
@@ -18,7 +18,9 @@ mcs_aot_image = $(the_libdir)/mcs.exe$(PLATFORM_AOT_SUFFIX)
mscorlib_dll = $(the_libdir)/mscorlib.dll
mscorlib_aot_image = $(mscorlib_dll)$(PLATFORM_AOT_SUFFIX)
-runtime_dep = $(topdir)/../mono/mini/mono
+# The $(dir $(RUNTIME)) is necessary to get path to the mono binary in case when we cross-compile
+# or just compile from a different directory than the top source dir
+runtime_dep = $(dir $(RUNTIME))/../mono/mini/mono
PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)