Merge.
authorJason Orendorff <jorendorff@mozilla.com>
Tue, 03 Feb 2009 12:22:55 -0600
changeset 24605 879703a426f401644f315dc76ad3ac13a28a06a2
parent 24604 e1ea24d8d7ed11383a1f467e88aca5df7327264d (current diff)
parent 24601 07be1f190a3d752d8aa038f9f5e071b51c01ba84 (diff)
child 24606 d52d9c18d3e0cd4be0d85cfabd84aa1e6aed48f1
push id5132
push userrsayre@mozilla.com
push dateWed, 04 Feb 2009 20:48:09 +0000
treeherdermozilla-central@76ca30e94e5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.2a1pre
Merge.
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -632,18 +632,22 @@ endif
 
 ifdef GNU_CC
 imacro_asm.js: imacro_asm.js.in jsopcode.tbl
 	$(CC) -c -x c -E -P -I$(srcdir) $< > $@
 
 GARBAGE += imacros.c.out imacro_asm.js
 
 ifndef CROSS_COMPILE
+# Obsolete comment: if you replace update-imacros with libs, this would apply
+# but then parallel gmake would sometimes try to run $(DIST)/bin/js before it
+# had been built and installed. Want a fix for this, de-automating for now.
+
 # Build imacros.c.out after descending into DIRS and building the js shell.
 # This may result in an updated imacros.c.out file that requires a re-build
 # to stabilize.
-libs:: imacros.c.out
+update-imacros:: imacros.c.out
 	@cmp -s imacros.c.out $(srcdir)/$< || cp imacros.c.out $(srcdir)
 
 %.c.out: %.jsasm imacro_asm.js
 	$(DIST)/bin/js imacro_asm.js $< > $@
 endif
 endif