From 6dd8ef485aec012f7659946c7aba2651d349befb Mon Sep 17 00:00:00 2001 From: davidot Date: Tue, 8 Mar 2022 17:26:32 +0100 Subject: [PATCH] Meta: Fix that the processor count was output to stderr and ignored Because of ninja's default behavior of using all processors this gave the correct behaviour because MAKEJOBS was empty. However this meant that the processor count was printed to stderr when building. --- Meta/serenity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meta/serenity.sh b/Meta/serenity.sh index 0bb9bab652..799022cecc 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -220,7 +220,7 @@ build_target() { fi # Get either the environement MAKEJOBS or all processors via CMake - [ -z "$MAKEJOBS" ] && MAKEJOBS=$(cmake -P "$SERENITY_SOURCE_DIR/Meta/CMake/processor-count.cmake") + [ -z "$MAKEJOBS" ] && MAKEJOBS=$(cmake -P "$SERENITY_SOURCE_DIR/Meta/CMake/processor-count.cmake" 2>&1) # With zero args, we are doing a standard "build" # With multiple args, we are doing an install/image/run