Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 21:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/gdb: do not descend into scripts/gdb from scripts

Browse Source 
Currently, Kbuild descends from scripts/Makefile to scripts/gdb/Makefile
just for creating symbolic links, but it does not need to do it so early.

Merge the two descending paths to simplify the code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Masahiro Yamada 2019-02-19 18:33:04 +09:00
parent 01d509a48b
commit 1e5ff84ffe
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1524,7 +1524,7 @@ $(DOC_TARGETS): scripts_basic FORCE
PHONY += scripts_gdb PHONY += scripts_gdb
scripts_gdb: prepare scripts_gdb: prepare
$(Q)$(MAKE) $(build)=scripts/gdb/linux build_constants_py $(Q)$(MAKE) $(build)=scripts/gdb
ifdef CONFIG_GDB_SCRIPTS ifdef CONFIG_GDB_SCRIPTS
all: scripts_gdb all: scripts_gdb

3
scripts/Makefile
View File

@ -39,7 +39,6 @@ build_unifdef: $(obj)/unifdef
subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins
subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-$(CONFIG_MODVERSIONS) += genksyms
subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_SECURITY_SELINUX) += selinux
subdir-$(CONFIG_GDB_SCRIPTS) += gdb
# Let clean descend into subdirs # Let clean descend into subdirs
subdir- += basic dtc kconfig mod package subdir- += basic dtc gdb kconfig mod package

9
scripts/gdb/linux/Makefile
View File

@ -14,11 +14,8 @@ quiet_cmd_gen_constants_py = GEN $@
$(CPP) -E -x c -P $(c_flags) $< > $@ ;\ $(CPP) -E -x c -P $(c_flags) $< > $@ ;\
sed -i '1,/<!-- end-c-headers -->/d;' $@ sed -i '1,/<!-- end-c-headers -->/d;' $@
targets += constants.py extra-y += constants.py
$(obj)/constants.py: $(SRCTREE)/$(obj)/constants.py.in FORCE $(obj)/constants.py: $(src)/constants.py.in FORCE
$(call if_changed_dep,gen_constants_py) $(call if_changed_dep,gen_constants_py)
build_constants_py: $(obj)/constants.py clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py)
@:
clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py) $(obj)/constants.py