Author: raja
Date: 2007-05-07 05:14:57 -0400 (Mon, 07 May 2007)
New Revision: 76812
Modified:
trunk/mono/ChangeLog
trunk/mono/runtime/Makefile.am
Log:
Fix parallel make.
* runtime/Makefile.am (test-support-file): Remove. Move rules ...
(_tmpinst/bin/mcs, _tmpinst/bin/gmcs, _tmpinst/bin/ilasm): ... here.
Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog 2007-05-07 09:11:30 UTC (rev 76811)
+++ trunk/mono/ChangeLog 2007-05-07 09:14:57 UTC (rev 76812)
@@ -1,3 +1,9 @@
+2007-05-07 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix parallel make.
+ * runtime/Makefile.am (test-support-file): Remove. Move rules ...
+ (_tmpinst/bin/mcs, _tmpinst/bin/gmcs, _tmpinst/bin/ilasm): ... here.
+
2007-05-05 Wade Berrier <[EMAIL PROTECTED]>
* scripts/mono-find-provides.in: don't use 'which' anymore (never solved
Modified: trunk/mono/runtime/Makefile.am
===================================================================
--- trunk/mono/runtime/Makefile.am 2007-05-07 09:11:30 UTC (rev 76811)
+++ trunk/mono/runtime/Makefile.am 2007-05-07 09:14:57 UTC (rev 76812)
@@ -108,24 +108,27 @@
$(mkinstalldirs) $(tmpinst)/bin
cp mono-wrapper $@
-$(tmpinst)/bin/mcs:
- $(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe
+$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
+ echo '#! /bin/sh' > $@ ; \
+ r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+ echo 'exec "'"$$r/$(tmpinst)/bin/mono"'"
"'"$$m/class/lib/default/mcs.exe"'" "$$@"' >> $@ ; \
+ chmod +x $@
-$(tmpinst)/bin/gmcs:
- $(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe
+$(tmpinst)/bin/gmcs: $(tmpinst)/bin/mono Makefile
+ echo '#! /bin/sh' > $@ ; \
+ r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+ echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/gmcs/gmcs.exe"'" "$$@"'
>> $@ ; \
+ chmod +x $@
-$(tmpinst)/bin/ilasm:
- $(MAKE) test-support-file target=$@ file=ilasm/ilasm.exe
+$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
+ echo '#! /bin/sh' > $@ ; \
+ r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+ echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/ilasm/ilasm.exe"'"
"$$@"' >> $@ ; \
+ chmod +x $@
test-support-files: $(TEST_SUPPORT_FILES)
@:
-test-support-file: $(tmpinst)/bin/mono
- test -n '$(target)$(file)'
- echo '#! /bin/sh' > $(target)
- r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec
"'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/$(file)"'" "$$@"' >> $(target)
- chmod +x $(target)
-
# the 'cygnus' option also disables the default 'distdir:' target, which we
_do_ want
MYDISTFILES = $(DIST_COMMON)
distdir: $(MYDISTFILES)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
