equal
deleted
inserted
replaced
176 str(self.raptor.systemFLM), |
176 str(self.raptor.systemFLM), |
177 self.shellpath, |
177 self.shellpath, |
178 talon_settings, |
178 talon_settings, |
179 self.raptor.systemFLM.Append('globals.mk') ) |
179 self.raptor.systemFLM.Append('globals.mk') ) |
180 |
180 |
|
181 # Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to |
|
182 # trap missing dependencies (ignoring user config files that we know are usually absent) |
|
183 if not (self.raptor.noDependGenerate or self.raptor.noDependInclude): |
|
184 self.makefile_prologue += """ |
|
185 |
|
186 $(FLMHOME)/user/final.mk: |
|
187 $(FLMHOME)/user/default.flm: |
|
188 $(FLMHOME)/user/globals.mk: |
|
189 |
|
190 .DEFAULT:: |
|
191 @echo "<warning>Missing dependency detected: $@</warning>" |
|
192 |
|
193 """ |
|
194 |
181 # Only output timings if requested on CLI |
195 # Only output timings if requested on CLI |
182 if self.raptor.timing: |
196 if self.raptor.timing: |
183 self.makefile_prologue += "\n# Print Start-time of Makefile parsing\n" \ |
197 self.makefile_prologue += "\n# Print Start-time of Makefile parsing\n" \ |
184 + timing_start + "\n\n" |
198 + timing_start + "\n\n" |
185 |
199 |
425 command += " " + "'" + o + "'" |
439 command += " " + "'" + o + "'" |
426 else: |
440 else: |
427 command += " " + o |
441 command += " " + o |
428 |
442 |
429 # Switch off dependency file including? |
443 # Switch off dependency file including? |
430 if self.raptor.noDependInclude: |
444 if self.raptor.noDependInclude or self.raptor.noDependGenerate: |
431 command += " NO_DEPEND_INCLUDE=1" |
445 command += " NO_DEPEND_INCLUDE=1" |
|
446 |
|
447 # Switch off dependency file generation (and, implicitly, inclusion)? |
|
448 if self.raptor.noDependGenerate: |
|
449 command += " NO_DEPEND_GENERATE=1" |
432 |
450 |
433 if self.usetalon: |
451 if self.usetalon: |
434 # use the descrambler if we set it up |
452 # use the descrambler if we set it up |
435 command += ' TALON_DESCRAMBLE=' |
453 command += ' TALON_DESCRAMBLE=' |
436 if self.scrambled: |
454 if self.scrambled: |