From 8726ea849d432839a4a9b61dff47f123a2ea262b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 2 Apr 2021 12:40:30 +0200
Subject: [PATCH] build: Add specified modules to the container build list.

And not only when ending with 32/64.
---
 build/makefile_base.mak | 3 ++-
 make/rules-common.mk    | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index c01cde28..5e2eca83 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -73,6 +73,7 @@ endif
 
 MAKECMDGOALS32 := $(filter-out all32,$(filter %32,$(MAKECMDGOALS)))
 MAKECMDGOALS64 := $(filter-out all64,$(filter %64,$(MAKECMDGOALS)))
+CONTAINERGOALS := $(MAKECMDGOALS32) $(MAKECMDGOALS64)
 
 all: all32 all64
 .PHONY: all
@@ -87,7 +88,7 @@ ifeq ($(CONTAINER),)
 J := $(shell nproc)
 container-build: private SHELL := $(CONTAINER_SHELL)
 container-build:
-	+$(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) -f $(firstword $(MAKEFILE_LIST)) $(MFLAGS) $(MAKEOVERRIDES) CONTAINER=1 $(MAKECMDGOALS32) $(MAKECMDGOALS64)
+	+$(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) -f $(firstword $(MAKEFILE_LIST)) $(MFLAGS) $(MAKEOVERRIDES) CONTAINER=1 $(CONTAINERGOALS)
 .PHONY: container-build
 
 all32 $(MAKECMDGOALS32): container-build
diff --git a/make/rules-common.mk b/make/rules-common.mk
index fda3e3db..0ec68c61 100644
--- a/make/rules-common.mk
+++ b/make/rules-common.mk
@@ -98,6 +98,8 @@ all$(3) $(1): $(1)$(3)
 all: $(1)
 .PHONY: all
 
+CONTAINERGOALS := $(CONTAINERGOALS) $(filter $(1),$(MAKECMDGOALS))
+
 
 $(2)_ENV$(3) = \
     CARGO_HOME=$$(OBJ)/.cargo \