From 550b42345a0235f3bc888778c6cc3a34f6a2919c Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 4 Dec 2018 21:31:54 +1100
Subject: Don't build project folders in parallel.

---
 Bootloaders/makefile | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'Bootloaders')

diff --git a/Bootloaders/makefile b/Bootloaders/makefile
index 33e1396fd..1942df61c 100644
--- a/Bootloaders/makefile
+++ b/Bootloaders/makefile
@@ -22,20 +22,9 @@ ifeq ($(MAKELEVEL), 10)
    $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif
 
-# Need to special-case building without a per-project object directory
-ifeq ($(OBJDIR),)
-   # If no target specified, force "clean all" and disallow parallel build
-   ifeq ($(MAKECMDGOALS),)
-      MAKECMDGOALS := clean all
-      .NOTPARALLEL:
-   endif
-
-   # If one of the targets is to build, force "clean" beforehand and disallow parallel build
-   ifneq ($(findstring all, $(MAKECMDGOALS)),)
-      MAKECMDGOALS := clean $(MAKECMDGOALS)
-      .NOTPARALLEL:
-   endif
-endif
+# Build each directory sequentially, even if we are building using multiple
+# cores within each project
+.NOTPARALLEL:
 
 %: $(PROJECT_DIRECTORIES)
 	@echo . > /dev/null
-- 
cgit v1.2.3