OrgACRN
/
clear-pkgs-acrn-hypervisor
mirror of https://github.com/clearlinux-pkgs/acrn-hypervisor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
clear-pkgs-acrn-hypervisor/0004-Use-MAKE-when-recursin...

207 lines
8.7 KiB
Diff
Raw Blame History

From d909107ab74da0770335c7feef0215c2ba1837ce Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Wed, 16 Jan 2019 21:35:20 +0000
Subject: [PATCH 4/6] Use $(MAKE) when recursing
commit 5ba4afcffeaf699102c3f46e19cd38d6ca30d6bb master
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>
Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
---
Makefile | 48 ++++++++++++++++++++++----------------------
devicemodel/Makefile | 4 ++--
tools/Makefile | 28 +++++++++++++-------------
3 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/Makefile b/Makefile
index 770a0dc5..5c16aea0 100644
--- a/Makefile
+++ b/Makefile
@@ -46,35 +46,35 @@ export TOOLS_OUT
all: hypervisor devicemodel tools
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)
+ $(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)
ifeq ($(FIRMWARE),uefi)
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
sbl-hypervisor:
@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)
- 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/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/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE) clean
+ $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl/up2 BOARD=up2 FIRMWARE=sbl RELEASE=$(RELEASE)
devicemodel: tools
- 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) clean
+ $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG)
tools:
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:
- make -C $(T)/doc html BUILDDIR=$(DOC_OUT)
+ $(MAKE) -C $(T)/doc html BUILDDIR=$(DOC_OUT)
.PHONY: clean
clean:
- make -C $(T)/tools OUT_DIR=$(TOOLS_OUT) clean
- make -C $(T)/doc BUILDDIR=$(DOC_OUT) clean
+ $(MAKE) -C $(T)/tools OUT_DIR=$(TOOLS_OUT) clean
+ $(MAKE) -C $(T)/doc BUILDDIR=$(DOC_OUT) clean
rm -rf $(ROOT_OUT)
.PHONY: install
@@ -82,31 +82,31 @@ install: hypervisor-install devicemodel-install tools-install
hypervisor-install:
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
ifeq ($(FIRMWARE),uefi)
- 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)/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
endif
hypervisor-install-debug:
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
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
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/up2 BOARD=up2 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
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/up2 BOARD=up2 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
devicemodel-install:
- make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
+ $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) 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
diff --git a/devicemodel/Makefile b/devicemodel/Makefile
index aaeabee6..b928bbd0 100644
--- a/devicemodel/Makefile
+++ b/devicemodel/Makefile
@@ -164,7 +164,7 @@ all: $(DM_OBJDIR)/$(PROGRAM)
@echo -n ""
$(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)
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS)
@@ -224,4 +224,4 @@ install-bios: $(BIOS_BIN)
install -D --mode=0664 -t $(DESTDIR)/usr/share/acrn/bios $^
install-vmcfg:
- make -C $(BASEDIR)/vmcfg install DESTDIR=$(DESTDIR) BASEDIR=$(BASEDIR)
+ $(MAKE) -C $(BASEDIR)/vmcfg install DESTDIR=$(DESTDIR) BASEDIR=$(BASEDIR)
diff --git a/tools/Makefile b/tools/Makefile
index ed5077e8..f0102427 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9,26 +9,26 @@ all: acrnlog acrn-manager acrntrace acrnbridge
endif
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:
- make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR)
+ $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR)
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:
- make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR)
+ $(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR)
acrnbridge:
- make -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR)
+ $(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR)
.PHONY: clean
clean:
- make -C $(T)/acrn-crashlog 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)/acrnlog 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)/acrntrace OUT_DIR=$(OUT_DIR) clean
+ $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) clean
rm -rf $(OUT_DIR)
.PHONY: install
@@ -39,16 +39,16 @@ install: acrnlog-install acrn-manager-install acrntrace-install acrnbridge-insta
endif
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:
- make -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) install
+ $(MAKE) -C $(T)/acrnlog OUT_DIR=$(OUT_DIR) 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:
- make -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) install
+ $(MAKE) -C $(T)/acrntrace OUT_DIR=$(OUT_DIR) install
acrnbridge-install:
- make -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install
+ $(MAKE) -C $(T)/acrnbridge OUT_DIR=$(OUT_DIR) install
--
2.20.0
Reference in New Issue View Git Blame Copy Permalink