github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-19 20:22:46 +00:00
Code Issues Projects Releases Wiki Activity

Use $(MAKE) when recursing

Browse Source 
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>
This commit is contained in:
Ross Burton 2019-01-16 21:35:20 +00:00 committed by wenlingz
parent d0c9fce72d
commit 5ba4afcffe
3 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Makefile
View File

@ -46,35 +46,35 @@ export TOOLS_OUT
all: hypervisor devicemodel tools all: hypervisor devicemodel tools
hypervisor: hypervisor:
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) clean $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) clean
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)
ifeq ($(FIRMWARE),uefi) ifeq ($(FIRMWARE),uefi)
echo "building hypervisor as EFI executable..." echo "building hypervisor as EFI executable..."
make -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) $(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT)
endif endif
sbl-hypervisor: sbl-hypervisor:
@mkdir -p $(HV_OUT)-sbl/apl-mrb $(HV_OUT)-sbl/up2 @mkdir -p $(HV_OUT)-sbl/apl-mrb $(HV_OUT)-sbl/up2
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) clean $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) clean
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE)
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) clean $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) clean
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE)
devicemodel: tools devicemodel: tools
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG) $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG)
tools: tools:
mkdir -p $(TOOLS_OUT) mkdir -p $(TOOLS_OUT)
make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) $(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE)
doc: doc:
make -C $(T)/doc html BUILDDIR=$(DOC_OUT) $(MAKE) -C $(T)/doc html BUILDDIR=$(DOC_OUT)
.PHONY: clean .PHONY: clean
clean: clean:
make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) clean $(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) clean
make -C $(T)/doc BUILDDIR=$(DOC_OUT) clean $(MAKE) -C $(T)/doc BUILDDIR=$(DOC_OUT) clean
rm -rf $(ROOT_OUT) rm -rf $(ROOT_OUT)
.PHONY: install .PHONY: install
@ -82,31 +82,31 @@ install: hypervisor-install devicemodel-install tools-install
hypervisor-install: hypervisor-install:
ifeq ($(FIRMWARE),sbl) ifeq ($(FIRMWARE),sbl)
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install
endif endif
ifeq ($(FIRMWARE),uefi) ifeq ($(FIRMWARE),uefi)
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)
make -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install $(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install
endif endif
hypervisor-install-debug: hypervisor-install-debug:
ifeq ($(FIRMWARE),sbl) ifeq ($(FIRMWARE),sbl)
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install-debug $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install-debug
endif endif
ifeq ($(FIRMWARE),uefi) ifeq ($(FIRMWARE),uefi)
make -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install-debug $(MAKE) -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install-debug
endif endif
sbl-hypervisor-install: sbl-hypervisor-install:
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) install $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) install
sbl-hypervisor-install-debug: sbl-hypervisor-install-debug:
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install-debug $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/apl-mrb BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install-debug
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) install-debug $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) install-debug
devicemodel-install: devicemodel-install:
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
tools-install: tools-install:
make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install $(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install

4
devicemodel/Makefile
View File

@ -165,7 +165,7 @@ all: $(DM_OBJDIR)/$(PROGRAM)
@echo -n "" @echo -n ""
$(VMCFG_CONFIG_H): $(VMCFG_CONFIG_H):
make -C $(BASEDIR)/vmcfg $@ BASEDIR=$(BASEDIR) DM_OBJDIR=$(DM_OBJDIR) $(MAKE) -C $(BASEDIR)/vmcfg $@ BASEDIR=$(BASEDIR) DM_OBJDIR=$(DM_OBJDIR)
$(DM_OBJDIR)/$(PROGRAM): $(OBJS) $(DM_OBJDIR)/$(PROGRAM): $(OBJS)
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS)
@ -228,4 +228,4 @@ install-bios: $(BIOS_BIN)
install -D --mode=0664 -t $(DESTDIR)/usr/share/acrn/bios $^ install -D --mode=0664 -t $(DESTDIR)/usr/share/acrn/bios $^
install-vmcfg: install-vmcfg:
make -C $(BASEDIR)/vmcfg install DESTDIR=$(DESTDIR) BASEDIR=$(BASEDIR) $(MAKE) -C $(BASEDIR)/vmcfg install DESTDIR=$(DESTDIR) BASEDIR=$(BASEDIR)

28
tools/Makefile
View File

@ -9,26 +9,26 @@ all: acrnlog acrn-manager acrntrace acrnbridge
endif endif
acrn-crashlog: acrn-crashlog:
make -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) $(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
acrnlog: acrnlog:
make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR)
acrn-manager: acrn-manager:
make -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE) $(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) RELEASE=$(RELEASE)
acrntrace: acrntrace:
make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) $(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR)
acrnbridge: acrnbridge:
make -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) $(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR)
.PHONY: clean .PHONY: clean
clean: clean:
make -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) clean $(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) clean
make -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) clean $(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) clean
make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) clean $(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) clean
make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) clean $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) clean
rm -rf $(OUT_DIR) rm -rf $(OUT_DIR)
.PHONY: install .PHONY: install
@ -39,16 +39,16 @@ install: acrnlog-install acrn-manager-install acrntrace-install acrnbridge-insta
endif endif
acrn-crashlog-install: acrn-crashlog-install:
make -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) install $(MAKE) -C $(T)/acrn-crashlog OUT_DIR=$(OUT_DIR) install
acrnlog-install: acrnlog-install:
make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) install $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) install
acrn-manager-install: acrn-manager-install:
make -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) install $(MAKE) -C $(T)/acrn-manager OUT_DIR=$(OUT_DIR) install
acrntrace-install: acrntrace-install:
make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) install $(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) install
acrnbridge-install: acrnbridge-install:
make -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install $(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install