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.
Ensure that a .DEFAULT target isn't used when --no-depend-include is in play. fix
authorJon Chatten
Thu, 04 Feb 2010 14:09:55 +0000
branchfix
changeset 224 c037b5dccbab
parent 223 25b4c60594cd
child 225 d401dbd3a410
Ensure that a .DEFAULT target isn't used when --no-depend-include is in play.
sbsv2/raptor/python/raptor_make.py file | annotate | diff | comparison | revisions 
--- a/sbsv2/raptor/python/raptor_make.py	Wed Feb 03 15:59:39 2010 +0000
+++ b/sbsv2/raptor/python/raptor_make.py	Thu Feb 04 14:09:55 2010 +0000
@@ -176,9 +176,9 @@
 			 talon_settings,
 			 self.raptor.systemFLM.Append('globals.mk') )
 
-		# Unless dependency generated has been disabled via the CLI, use a .DEFAULT target to
+		# Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to
 		# trap missing dependencies (ignoring user config files that we know are usually absent)
-		if not Raptor.noDependGenerate:
+		if not Raptor.noDependGenerate and not Raptor.noDependInclude:
 			self.makefile_prologue += """
 $(FLMHOME)/user/final.mk:
 $(FLMHOME)/user/default.flm:
FCL/sftools/dev/build