aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2023-07-17 17:28:55 +0200
committerbartus2023-07-17 17:43:53 +0200
commitad2131550c365188f65077fd1efe40eca0858347 (patch)
treecb72b8e9863c5c3f0e07ef9d2ebddfdd37856cb2
parent0aae0bbf00020b8f951e6c2ff3882fe1b79f2cd6 (diff)
downloadaur-ad2131550c365188f65077fd1efe40eca0858347.tar.gz
Refactor MAKEFLAGS ninja workaround
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index f6cdb7c8fb0e..5cc4b69b217b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _fragment=${FRAGMENT:-#branch=main}
depends+=( materialx )
export PATH+=":/opt/materialx"
}
-((DISABLE_NINJA)) || makedepends+=('ninja')
+((DISABLE_NINJA)) || { makedepends+=('ninja'); : ${MAKEFLAGS:--j1}; }
#shellcheck disable=SC2015
((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.4'); }
@@ -124,7 +124,7 @@ build() {
"${_CMAKE_FLAGS[@]}"
export NINJA_STATUS="[%p | %f<%r<%u | %cbps ] "
# shellcheck disable=SC2086 # allow MAKEFLAGS to split when multiple flags provided.
- if ((DISABLE_NINJA)); then make -C "$srcdir/build" ; else ninja -C "$srcdir/build" ${MAKEFLAGS:--j1}; fi
+ cmake --build build ${MAKEFLAGS}
}
package() {