diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-04-21 13:53:36 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-04-21 13:53:36 +0400 |
| commit | 0bdaad5f082b30355b8ef2081aa0b90a6c9a2612 (patch) | |
| tree | aaefda0ed3ce0e05af18c1a717d8ded8e56a4c62 /runtime | |
| parent | 882bcd341a37b651db4f5a50bcc83ad23d8988af (diff) | |
2005-04-21 Raja R Harinath <rharinath@novell.com>
* runtime/Makefile.am: Update. Pass 'monodis-wrapper' as ILDISASM
to sub-makes.
* runtime/monodis-wrapper.in: New file.
* configure.in (runtime/monodis-wrapper): Create.
svn path=/trunk/mono/; revision=43387
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 12 | ||||
| -rw-r--r-- | runtime/monodis-wrapper.in | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index ca2624f99d7..e8e653f78e4 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = cygnus tmpinst = _tmpinst -noinst_SCRIPTS = mono-wrapper +noinst_SCRIPTS = mono-wrapper monodis-wrapper symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config @@ -22,7 +22,7 @@ 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 - d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' all-profiles + d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' all-profiles if INSTALL_2_0 build_profiles = default net_2_0 @@ -37,7 +37,7 @@ install: install-exec install-data install-exec: $(SUPPORT_FILES) d=`pwd`; \ cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ - RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles + RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles # override automake install-data: @@ -47,7 +47,7 @@ install-data: uninstall: d=`pwd`; \ cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ - RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles + RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles clean-local: d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles @@ -67,11 +67,11 @@ test_select = ONLY_CENTUM_TESTS=yes endif mcs-do-test-profiles: - d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' test-profiles + d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' test-profiles mcs-do-run-test-profiles: test-support-files d=`pwd`; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \ - ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \ + ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \ rm -fr $(tmpinst); $$ret if PLATFORM_WIN32 diff --git a/runtime/monodis-wrapper.in b/runtime/monodis-wrapper.in new file mode 100644 index 00000000000..3d62405181e --- /dev/null +++ b/runtime/monodis-wrapper.in @@ -0,0 +1,6 @@ +#! /bin/sh +r='@mono_build_root@' +MONO_CFG_DIR='@mono_cfg_dir@' +MONO_SHARED_DIR=$r/runtime +export MONO_CFG_DIR MONO_SHARED_DIR +exec "$r/libtool" --mode=execute "$r/mono/dis/monodis" "$@" |