Skip to content

Commit

Permalink
scripts/gdb: do not descend into scripts/gdb from scripts
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Masahiro Yamada committed Feb 27, 2019
1 parent 01d509a commit 1e5ff84
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@ $(DOC_TARGETS): scripts_basic FORCE

PHONY += scripts_gdb
scripts_gdb: prepare
$(Q)$(MAKE) $(build)=scripts/gdb/linux build_constants_py
$(Q)$(MAKE) $(build)=scripts/gdb

ifdef CONFIG_GDB_SCRIPTS
all: scripts_gdb
Expand Down
3 changes: 1 addition & 2 deletions scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ build_unifdef: $(obj)/unifdef
subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins
subdir-$(CONFIG_MODVERSIONS) += genksyms
subdir-$(CONFIG_SECURITY_SELINUX) += selinux
subdir-$(CONFIG_GDB_SCRIPTS) += gdb

# Let clean descend into subdirs
subdir- += basic dtc kconfig mod package
subdir- += basic dtc gdb kconfig mod package
9 changes: 3 additions & 6 deletions scripts/gdb/linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ quiet_cmd_gen_constants_py = GEN $@
$(CPP) -E -x c -P $(c_flags) $< > $@ ;\
sed -i '1,/<!-- end-c-headers -->/d;' $@

targets += constants.py
$(obj)/constants.py: $(SRCTREE)/$(obj)/constants.py.in FORCE
extra-y += constants.py
$(obj)/constants.py: $(src)/constants.py.in FORCE
$(call if_changed_dep,gen_constants_py)

build_constants_py: $(obj)/constants.py
@:

clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py) $(obj)/constants.py
clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py)

0 comments on commit 1e5ff84

Please sign in to comment.