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>
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

View File

@@ -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