[haiku-commits] r36353 - haiku/trunk/src/bin/bash/builtins

  • From: ingo_weinhold@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 19 Apr 2010 17:23:51 +0200 (CEST)

Author: bonefish
Date: 2010-04-19 17:23:51 +0200 (Mon, 19 Apr 2010)
New Revision: 36353
Changeset: http://dev.haiku-os.org/changeset/36353/haiku
Ticket: http://dev.haiku-os.org/ticket/5750

Modified:
   haiku/trunk/src/bin/bash/builtins/Jamfile
Log:
Reverted the work-around introduced in r35619. It actually is harmful, since
it introduces cyclic dependencies. The .c files generated from the .def files
include builtext.h, which is built together with builtins.c. So builtins.c
can't depend on the generated .c files. Fixes #5750 for good.


Modified: haiku/trunk/src/bin/bash/builtins/Jamfile
===================================================================
--- haiku/trunk/src/bin/bash/builtins/Jamfile   2010-04-19 14:17:17 UTC (rev 
36352)
+++ haiku/trunk/src/bin/bash/builtins/Jamfile   2010-04-19 15:23:51 UTC (rev 
36353)
@@ -67,11 +67,6 @@
        MkBuiltinsComp $(source) : $(bashDefFile) ;
 }
 
-# TODO: Work-around for a bug in jam. These dependencies aren't necessary, but
-# without them a jam run with multiple jobs sometimes tries to build builtins.o
-# before builtins.c has been built.
-Depends [ FGristFiles builtins.c ] : [ FGristFiles $(bashDefFiles:S=.c) ] ;
-
 # generate builtext.h and builtins.c
 MkBuiltinsExt <bash>builtext.h [ FGristFiles builtins.c ] : $(bashDefFiles) ;
 


Other related posts: