Sort user commandline options when generating 'scan-build' target

We receive these options from the 'argparse' module in a random
order. To ensure the build.ninja file doesn't include random variations
we should sort them before writing them back out.
pull/1548/head
Sam Thursfield 8 years ago
parent c408bd6a8e
commit 2db11f1383
  1. 5
      mesonbuild/backend/ninjabackend.py

@ -2276,7 +2276,10 @@ rule FORTRAN_DEP_HACK
cmds = [] cmds = []
for (k, v) in self.environment.coredata.user_options.items(): for (k, v) in self.environment.coredata.user_options.items():
cmds.append('-D' + k + '=' + (v.value if isinstance(v.value, str) else str(v.value).lower())) cmds.append('-D' + k + '=' + (v.value if isinstance(v.value, str) else str(v.value).lower()))
return cmds # The order of these arguments must be the same between runs of Meson
# to ensure reproducible output. The order we pass them shouldn't
# affect behaviour in any other way.
return sorted(cmds)
# For things like scan-build and other helper tools we might have. # For things like scan-build and other helper tools we might have.
def generate_utils(self, outfile): def generate_utils(self, outfile):

Loading…
Cancel
Save