29 lines
1002 B
Diff
29 lines
1002 B
Diff
From bda1aa9d494e4c92374db32f47e456ff9cd35540 Mon Sep 17 00:00:00 2001
|
|
From: Jason Gross <jgross@mit.edu>
|
|
Date: Mon, 18 Dec 2017 17:05:45 -0500
|
|
Subject: [PATCH] Enable parallel build, fix #88
|
|
|
|
Apparently, the jobserver flags don't show up until we're actually
|
|
executing a rule. So rather than save the old flags, we instead record
|
|
whether or not we've seen -B before adding it (actually, whether we've
|
|
seen -B or B, since it seems that make stores B rather than -B in
|
|
MAKEFLAGS?), and then, later, we filter out B and -B only if we didn't
|
|
see them before we added them.
|
|
---
|
|
mathcomp/Makefile | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- mathcomp/Makefile
|
|
+++ mathcomp/Makefile
|
|
@@ -15,7 +15,9 @@ else
|
|
COQDEP=$(COQBIN)coqdep
|
|
endif
|
|
|
|
-OLD_MAKEFLAGS:=$(MAKEFLAGS)
|
|
+HAS_B:=$(filter -B B,$(MAKEFLAGS))
|
|
+# OLD_MAKEFLAGS must use =, not :=, to capture MAKEFLAGS at call time
|
|
+OLD_MAKEFLAGS=$(if $(HAS_B),$(MAKEFLAGS),$(filter-out -B B,$(MAKEFLAGS)))
|
|
MAKEFLAGS+=-B
|
|
|
|
.DEFAULT_GOAL := all
|