summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin39536 -> 39542 bytes
-rw-r--r--eclass/meson.eclass16
2 files changed, 2 insertions, 14 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 338fa70ca4db..fe64918845e7 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index a22a85887584..a2bc5537e458 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -440,23 +440,11 @@ meson_src_compile() {
pushd "${BUILD_DIR}" > /dev/null || die
- local mesoncompileargs=(
- --jobs "$(get_makeopts_jobs 0)"
- --load-average "$(get_makeopts_loadavg 0)"
- )
-
case ${MESON_VERBOSE} in
- OFF) ;;
- *) mesoncompileargs+=( --verbose ) ;;
+ OFF) NINJA_VERBOSE=OFF eninja "$@" ;;
+ *) eninja "$@" ;;
esac
-
- mesoncompileargs+=( "$@" )
-
- set -- meson compile "${mesoncompileargs[@]}"
- echo "$@" >&2
- "$@"
local rv=$?
- [[ ${rv} -eq 0 ]] || die -n "compile failed"
popd > /dev/null || die
return ${rv}