OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Makefile: do not try to figure out BOARD and SCENARIO for cleanup 

The targets "clean" and "distclean" are special as they do not need BOARD
or SCENARIO from users. This patch stops the guesswork of BOARD and
SCENARIO if any of those two targets are specified.

It is assumed that "clean" or "distclean" is not invoked with other targets
at the same time.

Tracked-On: #8259
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Junjie Mao 2022-10-20 23:45:18 +08:00 committed by acrnsi-robot
parent 64cbc706b7
commit e96937aa89
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hypervisor/scripts/makefile/config.mk
View File

@ -150,10 +150,6 @@ ifdef RELEASE
endif endif
endif endif
ifeq ($(findstring $(MAKECMDGOALS),distclean),)
-include $(HV_CONFIG_MK)
endif
# BOARD/SCENARIO/BOARD_FILE/SCENARIO_FILE parameters sanity check. # BOARD/SCENARIO/BOARD_FILE/SCENARIO_FILE parameters sanity check.
# #
# 1. Raise an error if BOARD/SCENARIO (or BOARD_FILE/SCENARIO_FILE) are partially given. # 1. Raise an error if BOARD/SCENARIO (or BOARD_FILE/SCENARIO_FILE) are partially given.
@ -188,9 +184,12 @@ endif
# file. SCENARIO/SCENARIO_FILE are used in the same way. The following block translates the user-visible BOARD/SCENARIO # file. SCENARIO/SCENARIO_FILE are used in the same way. The following block translates the user-visible BOARD/SCENARIO
# (which is multiplexed) to the internal representation. # (which is multiplexed) to the internal representation.
ifeq ($(findstring $(MAKECMDGOALS),distclean),)
-include $(HV_CONFIG_MK)
$(eval $(call determine_config,BOARD)) $(eval $(call determine_config,BOARD))
$(eval $(call determine_config,SCENARIO)) $(eval $(call determine_config,SCENARIO))
$(eval $(call determine_build_type,n)) $(eval $(call determine_build_type,n))
endif
$(HV_BOARD_XML): $(BOARD_FILE) $(HV_BOARD_XML): $(BOARD_FILE)
@echo "Board XML is fetched from $(realpath $(BOARD_FILE))" @echo "Board XML is fetched from $(realpath $(BOARD_FILE))"