summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-02-09 16:59:12 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-02-09 16:59:12 +0900
commita2fa4368d1c417be6687969c5ddbbee68628c156 (patch)
treede033a982704fcc825d8bb197702719580c19a27
parent8fd3109aefd385d14a094d1bb83b94639232d490 (diff)
downloadbuildstream-a2fa4368d1c417be6687969c5ddbbee68628c156.tar.gz
meson.yaml: Feed max-jobs as a nocache environment variable
This prevents the %{max-jobs} variable from effecting the build's cache key.
-rw-r--r--buildstream/plugins/elements/meson.yaml12
1 files changed, 11 insertions, 1 deletions
diff --git a/buildstream/plugins/elements/meson.yaml b/buildstream/plugins/elements/meson.yaml
index d6543c833..81bdfa9e2 100644
--- a/buildstream/plugins/elements/meson.yaml
+++ b/buildstream/plugins/elements/meson.yaml
@@ -16,7 +16,7 @@ variables:
--sharedstatedir=%{sharedstatedir} \
--mandir=%{mandir} \
--infodir=%{infodir}
- ninja: ninja -j %{max-jobs} -C %{build-dir}
+ ninja: ninja -j ${NINJAJOBS} -C %{build-dir}
ninja-install: env DESTDIR="%{install-root}" ninja -C %{build-dir} install
config:
@@ -46,3 +46,13 @@ config:
strip-commands:
- |
%{strip-binaries}
+
+
+# Use max-jobs CPUs for building
+environment:
+ NINJAJOBS: %{max-jobs}
+
+# And dont consider NINJAJOBS as something which may
+# effect build output.
+environment-nocache:
+- NINJAJOBS