diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 42 | ||||
| -rw-r--r-- | runtime/Makefile.am | 14 |
3 files changed, 43 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 16a731f2287..6a77594d175 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-09-27 Raja R Harinath <rharinath@novell.com> + + * 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. + 2005-09-22 Raja R Harinath <rharinath@novell.com> * configure.in (MONO_VERSION): Emit it into config.make. Don't 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} diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 457c7f9fda9..e32ad736c64 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -16,17 +16,19 @@ $(symlinks): SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config -# The write check is to foil 'make distcheck' -all-local: $(SUPPORT_FILES) - if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' all-profiles - if INSTALL_2_0 build_profiles = default net_2_0 else build_profiles = default endif +if BUILD_MCS + +# The write check is to foil 'make distcheck' +all-local: $(SUPPORT_FILES) + if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' all-profiles + # override automake install: install-exec install-data @@ -48,6 +50,8 @@ clean-local: -./semdel-wrapper -rm -fr $(etctmp) $(tmpinst) .wapi +endif BUILD_MCS + if INSTALL_2_0 TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs else |