aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-04-13 23:59:48 +0300
committerGitHub <noreply@github.com>2017-04-13 23:59:48 +0300
commitb951e60f0683c9198d62004a5ef3d4c1cb9ba38f (patch)
treeaaf098f0a1367ce5ebe5e6a239f02e27b5df0269 /mesonbuild/backend/ninjabackend.py
parentf0a077e55b1792ea67e1df4d747476bdf5f40eec (diff)
parent2db11f1383e3d9c59f54f4a742bd44ad85dce226 (diff)
downloadmeson-b951e60f0683c9198d62004a5ef3d4c1cb9ba38f.zip
meson-b951e60f0683c9198d62004a5ef3d4c1cb9ba38f.tar.gz
meson-b951e60f0683c9198d62004a5ef3d4c1cb9ba38f.tar.bz2
Merge pull request #1548 from ssssam/sam/stable-ordering
Stable ordering of some commandlines generated by 'gnome' module
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index dfb5600..98a2110 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2351,7 +2351,10 @@ rule FORTRAN_DEP_HACK
cmds = []
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()))
- 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.
def generate_utils(self, outfile):