Mercurial Mercurial > oss > FCL > sftools > dev > build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix: bug was preventing tcom speedup from accumulating source files with successive builds. fix
authortimothy.murphy@nokia.com
Tue, 18 May 2010 22:28:22 +0100
branchfix
changeset 568 d4ab34a8c6dc
parent 567 d420c77a7248
child 569 6656482ba0da
fix: bug was preventing tcom speedup from accumulating source files with successive builds.
sbsv2/raptor/lib/flm/tracecompiler.mk file | annotate | diff | comparison | revisions 
--- a/sbsv2/raptor/lib/flm/tracecompiler.mk	Tue May 18 22:13:09 2010 +0100
+++ b/sbsv2/raptor/lib/flm/tracecompiler.mk	Tue May 18 22:28:22 2010 +0100
@@ -162,7 +162,7 @@
 
 $(TRACE_SOURCE_LIST):
 	$(call startrule,sourcelist_combine) \
-	$(GNUCAT) $$^ | $(GNUSORT) -u > $$@.new && \
+	$(GNUCAT) $(TRACE_SOURCE_LIST) $$^ 2>/dev/null | $(GNUSORT) -u > $$@.new && \
 	$(GNUMD5SUM) -c $(TRACE_MARKER) 2>/dev/null ||  \
 	  $(GNUCP) $$@.new $$@ \
 	$(call endrule,sourcelist_combine)
@@ -185,7 +185,7 @@
 
 $(TRACE_SOURCE_LIST):
 	$(call startrule,sourcelist_combine) \
-	$(GNUCAT) $$^ | $(GNUSORT) -u > $$@.new && \
+	$(GNUCAT) $(TRACE_SOURCE_LIST) $$^ 2>/dev/null | $(GNUSORT) -u > $$@.new && \
 	$(GNUMD5SUM) -c $(TRACE_MARKER) 2>/dev/null ||  \
 	  $(GNUCP) $$@.new $$@ \
 	$(call endrule,sourcelist_combine)
FCL/sftools/dev/build