diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-09-27 13:54:29 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-09-27 13:54:29 +0400 |
| commit | 7e2cbb2e570c89a7ab1d79d1a3f0cad8e49c3cb6 (patch) | |
| tree | 6ca19d4ea962f1c2e327f2d75c807c0228c6bd7b /configure.in | |
| parent | f6eb9cb62509f3556cf1fa54c854f79f727b8876 (diff) | |
* configure.in (BUILD_MCS): New automake conditional. Used to
disable building the mcs/ tree if cross-compiling.
($mcsdir/build/config.make): Don't clobber if we're cross-compiling.
* runtime/Makefile.am (all-local, install, uninstall, clean-local):
Disable building in the mcs/ tree if !BUILD_MCS.
svn path=/trunk/mono/; revision=50834
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/configure.in b/configure.in index b26e88fe160..2478197016e 100644 --- a/configure.in +++ b/configure.in @@ -350,6 +350,9 @@ fi mcs_topdir='$(top_srcdir)/'$mcsdir mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir +## Maybe should also disable if mcsdir is invalid. Let's punt the issue for now. +AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno]) + AC_SUBST([mcs_topdir]) AC_SUBST([mcs_topdir_from_srcdir]) @@ -1810,22 +1813,29 @@ fi test -w $srcdir/$mcsdir/build || chmod +w $srcdir/$mcsdir/build - echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make - echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make - echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make - echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make - echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make - echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make - echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make - echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make - - export VERSION - [myver=$($AWK 'BEGIN { - split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".") - print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4] - }')] - - echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make + # + # If we are cross compiling, we don't build in the mcs/ tree. Let us not clobber + # any existing config.make. This allows people to share the same source tree + # with different build directories, one native and one cross + # + if test x$cross_compiling = xno; then + echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make + echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make + echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make + echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make + echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make + echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make + echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make + echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make + + export VERSION + [myver=$($AWK 'BEGIN { + split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".") + print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4] + }')] + + echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make + fi ) libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} |