build: run targets csopes,tags,.. without Rules.mk

Those targets make use of $(all_sources) which depends on TARGET_ARCH,
so we just need to set TARGET_ARCH earlier and once.

XEN_TARGET_ARCH isn't expected to change during the build, so
TARGET_SUBARCH and TARGET_ARCH aren't going to change either. Set them
once and for all in the Xen root Makefile. This allows to run more
targets without Rules.mk.

XEN_TARGET_ARCH is actually changed in arch/x86/boot/build32.mk, but
it doesn't use the TARGET_{,SUB}ARCH variables either, and doesn't use
Rules.mk (it replaces it).

TARGET_{,SUB}ARCH are no longer overridden because that would have
no effect on the values that Rules.mk will use.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Anthony PERARD authored and Jan Beulich committed 2020-03-06 10:15:49 +01:00
1 parent 5446def53a
commit a213de3f29
2 files changed
+15 -15

No files matched your search

+15 -10
View File
@@ -35,6 +35,11 @@ SRCARCH=$(shell echo $(ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g')
# we need XEN_TARGET_ARCH to generate the proper config
include $(XEN_ROOT)/Config.mk
# Set ARCH/SUBARCH appropriately.
export TARGET_SUBARCH := $(XEN_TARGET_ARCH)
export TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \
sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g')
# Allow someone to change their config file
export KCONFIG_CONFIG ?= .config
@@ -46,8 +51,8 @@ dist: install
build install:: include/config/auto.conf
.PHONY: build install uninstall clean distclean cscope TAGS tags MAP gtags tests
build install uninstall debug clean distclean cscope TAGS tags MAP gtags tests::
.PHONY: build install uninstall clean distclean MAP tests
build install uninstall debug clean distclean MAP tests::
ifneq ($(XEN_TARGET_ARCH),x86_32)
$(MAKE) -f Rules.mk _$@
else
@@ -223,25 +228,25 @@ endef
xenversion:
@echo $(XEN_FULLVERSION)
.PHONY: _TAGS
_TAGS:
.PHONY: TAGS
TAGS:
set -e; rm -f TAGS; \
$(call set_exuberant_flags,etags); \
$(all_sources) | xargs etags $$exuberant_flags -a
.PHONY: _tags
_tags:
.PHONY: tags
tags:
set -e; rm -f tags; \
$(call set_exuberant_flags,ctags); \
$(all_sources) | xargs ctags $$exuberant_flags -a
.PHONY: _gtags
_gtags:
.PHONY: gtags
gtags:
set -e; rm -f GTAGS GSYMS GPATH GRTAGS
$(all_sources) | gtags -f -
.PHONY: _cscope
_cscope:
.PHONY: cscope
cscope:
$(all_sources) > cscope.files
cscope -k -b -q
-5
View File
@@ -27,11 +27,6 @@ ifneq ($(origin verbose),undefined)
$(error "You must use 'make menuconfig' to enable/disable verbose now.")
endif
# Set ARCH/SUBARCH appropriately.
override TARGET_SUBARCH := $(XEN_TARGET_ARCH)
override TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \
sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g')
TARGET := $(BASEDIR)/xen
# Note that link order matters!
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.