From: Chih-Wei Huang Date: Tue, 10 Jul 2018 03:30:40 +0000 (+0800) Subject: kernel.mk: fix MacOS building issue X-Git-Tag: android-x86-8.1-r1~19 X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=786950cd94386f768060ec457f46c93c08bbb681 kernel.mk: fix MacOS building issue As reported, nproc is a linux only command. Don't use it on MacOS. --- diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk index c593a55..b2684e3 100644 --- a/build/tasks/kernel.mk +++ b/build/tasks/kernel.mk @@ -36,7 +36,7 @@ CROSS_COMPILE ?= $(abspath $(TARGET_TOOLS_PREFIX)) endif endif KBUILD_OUTPUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel) -mk_kernel := + $(hide) $(MAKE) -j$$(nproc) -l$$(($$(nproc)+2)) -C $(KERNEL_DIR) O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1) $(KERNEL_CLANG_CLAGS) +mk_kernel := + $(hide) $(MAKE) $(if $(filter darwin,$(HOST_OS)),,-j$$(nproc) -l$$(($$(nproc)+2))) -C $(KERNEL_DIR) O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1) $(KERNEL_CLANG_CLAGS) KERNEL_CONFIG_FILE := $(if $(wildcard $(TARGET_KERNEL_CONFIG)),$(TARGET_KERNEL_CONFIG),$(KERNEL_DIR)/$(KERNEL_CONFIG_DIR)/$(TARGET_KERNEL_CONFIG))