From 549504bddeec434fa88adb29cbf338762b3354e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 9 Dec 2016 16:38:28 +0100 Subject: [PATCH] Expose mono_build_root to mcs build system In an out-of-tree build the Makefile which contains get-monolite-latest doesn't exist in the source directory (which $(topdir)/.. would point to) but in the build directory. In order to invoke get-monolite-latest we need to actually call the Makefile in the correct directory which requires exposing the build directory to the mcs build system. --- configure.ac | 1 + mcs/build/profiles/basic.make | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 213b5380c34..f198f127a4e 100644 --- a/configure.ac +++ b/configure.ac @@ -4380,6 +4380,7 @@ fi echo "exec_prefix=$exec_prefix" >> $mcs_topdir/build/config.make echo "sysconfdir=$sysconfdir" >> $mcs_topdir/build/config.make echo 'mono_libdir=${exec_prefix}/lib' >> $mcs_topdir/build/config.make + echo "mono_build_root=$mono_build_root" >> $mcs_topdir/build/config.make echo 'IL_FLAGS = /debug' >> $mcs_topdir/build/config.make echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $mcs_topdir/build/config.make echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $mcs_topdir/build/config.make diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make index e9904bc396a..8a743b9c1f3 100644 --- a/mcs/build/profiles/basic.make +++ b/mcs/build/profiles/basic.make @@ -98,7 +98,7 @@ else do-get-monolite: @echo "*** Downloading bootstrap required 'monolite'" 1>&2 - $(MAKE) $(MAKE_Q) -C $(topdir)/../ get-monolite-latest + $(MAKE) $(MAKE_Q) -C $(mono_build_root) get-monolite-latest do-profile-check-monolite: $(depsdir)/.stamp @echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2 -- 2.25.1