2
0
Эх сурвалжийг харах

Fix parallel make.
* runtime/Makefile.am (test-support-file): Remove. Move rules ...
(_tmpinst/bin/mcs, _tmpinst/bin/gmcs, _tmpinst/bin/ilasm): ... here.

svn path=/trunk/mono/; revision=76812

Raja R Harinath 18 жил өмнө
parent
commit
c13db829c2
2 өөрчлөгдсөн 23 нэмэгдсэн , 14 устгасан
  1. 6 0
      ChangeLog
  2. 17 14
      runtime/Makefile.am

+ 6 - 0
ChangeLog

@@ -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

+ 17 - 14
runtime/Makefile.am

@@ -108,24 +108,27 @@ $(tmpinst)/bin/mono: mono-wrapper etc/mono/config
 	$(mkinstalldirs) $(tmpinst)/bin
 	cp mono-wrapper $@
 
-$(tmpinst)/bin/mcs:
-	$(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe
-
-$(tmpinst)/bin/gmcs:
-	$(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe
-
-$(tmpinst)/bin/ilasm:
-	$(MAKE) test-support-file target=$@ file=ilasm/ilasm.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: $(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: $(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)