summaryrefslogtreecommitdiffstats
path: root/MESON_FUNCTIONS
diff options
context:
space:
mode:
authorPavel Vinogradov2022-07-23 17:21:36 -0400
committerPavel Vinogradov2022-07-23 17:21:36 -0400
commit3a2b5ad0e7b4b6e6204c08fda311fcc39c029386 (patch)
treef904c19a02b575d2d2b08796f812d4ea96d28fbe /MESON_FUNCTIONS
parentbc5fde4cc1fc2fa5bba6ff39fddf10007cfc830f (diff)
MESON_FUNCTIONS: fixed meson_install BUILDER_OPTS, also made PREFIX truly local
Diffstat (limited to 'MESON_FUNCTIONS')
-rwxr-xr-xMESON_FUNCTIONS5
1 files changed, 3 insertions, 2 deletions
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
index 73a6adb557..49ae192a37 100755
--- a/MESON_FUNCTIONS
+++ b/MESON_FUNCTIONS
@@ -1,8 +1,7 @@
# special functions for projects which use meson build system
-local PREFIX=${PREFIX:-/usr}
-
meson_build () {
+ local PREFIX=${PREFIX:-/usr}
local MESON_BUILD_TYPE="${MESON_BUILD_TYPE:-release}" &&
local MESON_BUILD &&
@@ -38,6 +37,8 @@ meson_build () {
}
meson_install () {
+ local BUILDER_OPTS="-j ${MAKE_NJOBS} -C builddir/" &&
+
if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} NINJA-BUILD); then
BUILDER="muon samu"
elif [[ $(get_spell_provider ${SPELL} NINJA-BUILD) == samurai ]]; then