equal
deleted
inserted
replaced
416 # Set default options first so that they can be overridden by |
416 # Set default options first so that they can be overridden by |
417 # ones set by the --mo option on the raptor commandline: |
417 # ones set by the --mo option on the raptor commandline: |
418 command += " " + self.defaultMakeOptions |
418 command += " " + self.defaultMakeOptions |
419 # Can supply options on the commandline to override default settings. |
419 # Can supply options on the commandline to override default settings. |
420 if len(self.raptor.makeOptions) > 0: |
420 if len(self.raptor.makeOptions) > 0: |
421 command += " " + " ".join(self.raptor.makeOptions) |
421 for o in self.raptor.makeOptions: |
|
422 if o.find(";") != -1: |
|
423 command += " " + "'" + o + "'" |
|
424 elif o.find("\\") != -1: |
|
425 command += " " + o.replace("\\","\\\\") |
|
426 else: |
|
427 command += " " + o |
422 |
428 |
423 # Switch off dependency file including? |
429 # Switch off dependency file including? |
424 if self.raptor.noDependInclude: |
430 if self.raptor.noDependInclude: |
425 command += " NO_DEPEND_INCLUDE=1" |
431 command += " NO_DEPEND_INCLUDE=1" |
426 |
432 |
452 command += " " + " ".join(addTargets) |
458 command += " " + " ".join(addTargets) |
453 |
459 |
454 # Send stderr to a file so that it can't mess up the log (e.g. |
460 # Send stderr to a file so that it can't mess up the log (e.g. |
455 # clock skew messages from some build engines. |
461 # clock skew messages from some build engines. |
456 stderrfilename = makefile+'.stderr' |
462 stderrfilename = makefile+'.stderr' |
457 command += ' 2>"%s"' % stderrfilename |
463 command += " 2>'%s' " % stderrfilename |
458 |
464 |
459 # Substitute the makefile name for any occurrence of #MAKEFILE# |
465 # Substitute the makefile name for any occurrence of #MAKEFILE# |
460 command = command.replace("#MAKEFILE#", str(makefile)) |
466 command = command.replace("#MAKEFILE#", str(makefile)) |
461 |
467 |
462 self.raptor.Info("Executing '%s'", command) |
468 self.raptor.Info("Executing '%s'", command) |