From 872676c73573c514d1823509a511225207d3f9f1 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 2 Feb 2016 07:58:26 -0500 Subject: [PATCH] build: fix parallel builds of applications When building with more than 1 job, we were getting: make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. Trying to fix this in the Makefile resulted in dependency issues and unsatisfied dependencies in the compilation and build chain. Change-Id: Ic73d089cf6a0a0d7b6fd83908b8144c34af25582 Signed-off-by: Anas Nashif --- Makefile | 4 ++-- Makefile.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d1cb719963c..beabbfe9fb9 100644 --- a/Makefile +++ b/Makefile @@ -761,12 +761,12 @@ quiet_cmd_create-lnk = LINK $@ $(KERNEL_NAME).lnk: $(call cmd,create-lnk) -linker.cmd: +linker.cmd: $(zephyr-deps) $(Q)$(CC) -x assembler-with-cpp -nostdinc -undef -E -P \ $(LDFLAG_LINKERCMD) $(LD_TOOLCHAIN) -I$(srctree)/include \ -I$(objtree)/include/generated $(KBUILD_LDS) -o $@ -final-linker.cmd: +final-linker.cmd: $(zephyr-deps) $(Q)$(CC) -x assembler-with-cpp -nostdinc -undef -E -P \ $(LDFLAG_LINKERCMD) $(LD_TOOLCHAIN) -DFINAL_LINK -I$(srctree)/include \ -I$(objtree)/include/generated $(KBUILD_LDS) -o $@ diff --git a/Makefile.inc b/Makefile.inc index 127a79da267..2b04c72ca42 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -52,7 +52,7 @@ else S = -s endif -zephyrmake = @$(MAKE) -C $(ZEPHYR_BASE) O=$(1) CFLAGS=$(CFLAGS) \ +zephyrmake = @+$(MAKE) -C $(ZEPHYR_BASE) O=$(1) CFLAGS=$(CFLAGS) \ PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) $(2) DOTCONFIG = $(O)/.config