Skip to content

Commit 5ba4afc

Browse files
rossburtonwenlingz
rossburton
authored and
wenlingz
committed
Use $(MAKE) when recursing
Using 'make' directly means that the jobserver environment variables don't get passed down, so sub-builds for example don't use -j. This is documented as the wrong thing to do: https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html#MAKE-Variable Use $(MAKE) instead, and compile times drastically improve: acrn-devicemodel do_compile -13.5s -89.6% 15.0s -> 1.6s Tracked-On: #2370 Signed-off-by: Ross Burton <ross.burton@intel.com>
1 parent d0c9fce commit 5ba4afc

File tree

3 files changed

+40
-40
lines changed

3 files changed

+40
-40
lines changed

‎Makefile

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,67 +46,67 @@ export TOOLS_OUT
4646
all: hypervisor devicemodel tools
4747

4848
hypervisor:
49-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) clean
50-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)
49+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) clean
50+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)
5151
ifeq ($(FIRMWARE),uefi)
5252
echo "building hypervisor as EFI executable..."
53-
make -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT)
53+
$(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT)
5454
endif
5555

5656
sbl-hypervisor:
5757
@mkdir -p $(HV_OUT)-sbl/apl-mrb $(HV_OUT)-sbl/up2
58-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) clean
59-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE)
60-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) clean
61-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE)
58+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) clean
59+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE)
60+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) clean
61+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE)
6262

6363
devicemodel: tools
64-
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean
65-
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG)
64+
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean
65+
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG)
6666

6767
tools:
6868
mkdir -p $(TOOLS_OUT)
69-
make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE)
69+
$(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE)
7070

7171
doc:
72-
make -C $(T)/doc html BUILDDIR=$(DOC_OUT)
72+
$(MAKE) -C $(T)/doc html BUILDDIR=$(DOC_OUT)
7373

7474
.PHONY: clean
7575
clean:
76-
make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) clean
77-
make -C $(T)/doc BUILDDIR=$(DOC_OUT) clean
76+
$(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) clean
77+
$(MAKE) -C $(T)/doc BUILDDIR=$(DOC_OUT) clean
7878
rm -rf $(ROOT_OUT)
7979

8080
.PHONY: install
8181
install: hypervisor-install devicemodel-install tools-install
8282

8383
hypervisor-install:
8484
ifeq ($(FIRMWARE),sbl)
85-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install
85+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install
8686
endif
8787
ifeq ($(FIRMWARE),uefi)
88-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)
89-
make -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install
88+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)
89+
$(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install
9090
endif
9191

9292
hypervisor-install-debug:
9393
ifeq ($(FIRMWARE),sbl)
94-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install-debug
94+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install-debug
9595
endif
9696
ifeq ($(FIRMWARE),uefi)
97-
make -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install-debug
97+
$(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install-debug
9898
endif
9999

100100
sbl-hypervisor-install:
101-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install
102-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) install
101+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install
102+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) install
103103

104104
sbl-hypervisor-install-debug:
105-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install-debug
106-
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) install-debug
105+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install-debug
106+
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) install-debug
107107

108108
devicemodel-install:
109-
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
109+
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
110110

111111
tools-install:
112-
make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install
112+
$(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install

‎devicemodel/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ all: $(DM_OBJDIR)/$(PROGRAM)
165165
@echo -n ""
166166

167167
$(VMCFG_CONFIG_H):
168-
make -C $(BASEDIR)/vmcfg $@ BASEDIR=$(BASEDIR) DM_OBJDIR=$(DM_OBJDIR)
168+
$(MAKE) -C $(BASEDIR)/vmcfg $@ BASEDIR=$(BASEDIR) DM_OBJDIR=$(DM_OBJDIR)
169169

170170
$(DM_OBJDIR)/$(PROGRAM): $(OBJS)
171171
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS)
@@ -228,4 +228,4 @@ install-bios: $(BIOS_BIN)
228228
install -D --mode=0664 -t $(DESTDIR)/usr/share/acrn/bios $^
229229

230230
install-vmcfg:
231-
make -C $(BASEDIR)/vmcfg install DESTDIR=$(DESTDIR) BASEDIR=$(BASEDIR)
231+
$(MAKE) -C $(BASEDIR)/vmcfg install DESTDIR=$(DESTDIR) BASEDIR=$(BASEDIR)

‎tools/Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ all: acrnlog acrn-manager acrntrace acrnbridge
99
endif
1010

1111
acrn-crashlog:
12-
make -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
12+
$(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
1313

1414
acrnlog:
15-
make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR)
15+
$(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR)
1616

1717
acrn-manager:
18-
make -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
18+
$(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
1919

2020
acrntrace:
21-
make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR)
21+
$(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR)
2222

2323
acrnbridge:
24-
make -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR)
24+
$(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR)
2525

2626
.PHONY: clean
2727
clean:
28-
make -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) clean
29-
make -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) clean
30-
make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) clean
31-
make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) clean
28+
$(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) clean
29+
$(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) clean
30+
$(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) clean
31+
$(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) clean
3232
rm -rf $(OUT_DIR)
3333

3434
.PHONY: install
@@ -39,16 +39,16 @@ install: acrnlog-install acrn-manager-install acrntrace-install acrnbridge-insta
3939
endif
4040

4141
acrn-crashlog-install:
42-
make -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) install
42+
$(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) install
4343

4444
acrnlog-install:
45-
make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) install
45+
$(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) install
4646

4747
acrn-manager-install:
48-
make -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) install
48+
$(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) install
4949

5050
acrntrace-install:
51-
make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) install
51+
$(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) install
5252

5353
acrnbridge-install:
54-
make -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install
54+
$(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install

0 commit comments

Comments
 (0)