From 108e36aa107b273b6a06ab1c2ed0c6ca981d9ab3 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 6 Sep 2023 16:51:01 -0400 Subject: nj: Pull in fixes to pass through error code --- README.md | 2 +- nj | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 94db353..c2573b3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A collection of scripts to build and test [Mesa](https://www.mesa3d.org/) withou ## Scripts -- [nj](nj) - Run [ninja](https://github.com/ninja-build/ninja) from anywhere in the project git repository +- [nj](nj) - Run [ninja](https://github.com/ninja-build/ninja) from anywhere in the project git repository. (upstream: [nj repo](gitlab.freedesktop.org/kwg/nj)) - [mesa-run](mesa-run) - helper script. Not used directly. Requires [jq](https://github.com/jqlang/jq) - [mesa-debug](mesa-debug) - Debug build - [mesa-debug-asan](mesa-debug-asan) - Debug build with [AddressSanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer) diff --git a/nj b/nj index 7a29e39..c2d094c 100755 --- a/nj +++ b/nj @@ -73,5 +73,8 @@ cd "$builddir" extratargets="$(cat extratargets 2>/dev/null)" targets="${@:-all $extratargets}" -ninja $targets -[[ "$targets" == all* ]] && [ -e install ] && ninja install > /dev/null +ninja $targets || exit $? + +if [[ "$targets" == all* ]] && [ -e install ]; then + ninja install > /dev/null +fi -- cgit v1.2.3