From 90a2b0ac85b999f13dd7525227b17d811325fb27 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 6 Feb 2024 19:35:44 -0500 Subject: [PATCH] Call Ninja Directly --- dependencies/qemu/CMakeLists.txt | 10 +--------- dependencies/symbol-processor/src | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dependencies/qemu/CMakeLists.txt b/dependencies/qemu/CMakeLists.txt index 4ca7426ee..860bbe242 100644 --- a/dependencies/qemu/CMakeLists.txt +++ b/dependencies/qemu/CMakeLists.txt @@ -11,14 +11,6 @@ if(MCPI_IS_FLATPAK_BUILD) set(QEMU_PATCH "sed" "-i" "s/libdrm/libdrm-dis/g" "/meson.build") endif() -# Inherit Make Jobserver ()If Present) -include(ProcessorCount) -ProcessorCount(NPROC) -set(MAKE "make" "-j${NPROC}") -if(CMAKE_GENERATOR STREQUAL "Unix Makefiles") - set(MAKE "$(MAKE)") -endif() - # Build include(ExternalProject) set(PKGCONFIG_ENV "") @@ -41,7 +33,7 @@ ExternalProject_Add(qemu "--target-list=arm-linux-user" "--without-default-features" USES_TERMINAL_CONFIGURE TRUE - BUILD_COMMAND ${MAKE} "qemu-arm" + BUILD_COMMAND ninja "qemu-arm" USES_TERMINAL_BUILD TRUE INSTALL_COMMAND "" TEST_COMMAND "" diff --git a/dependencies/symbol-processor/src b/dependencies/symbol-processor/src index fbdd1e279..8bca4b7ec 160000 --- a/dependencies/symbol-processor/src +++ b/dependencies/symbol-processor/src @@ -1 +1 @@ -Subproject commit fbdd1e27983eeb1329d51ee3264b2974c4901fbe +Subproject commit 8bca4b7ec6aa28ef6fbc894d1f358468bcc4b321