lkml.org 
[lkml]   [2015]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] tools build: Move dependency copy into function
    Commit-ID:  275e2d95591e2714d6b541d4e26959381d6b2705
    Gitweb: http://git.kernel.org/tip/275e2d95591e2714d6b541d4e26959381d6b2705
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Wed, 23 Sep 2015 12:33:59 +0200
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 28 Sep 2015 15:50:55 -0300

    tools build: Move dependency copy into function

    So it's easier to add more functionality in the following commit.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1443004442-32660-5-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/build/Build.include | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    diff --git a/tools/build/Build.include b/tools/build/Build.include
    index 4c8daac..851c420 100644
    --- a/tools/build/Build.include
    +++ b/tools/build/Build.include
    @@ -55,14 +55,19 @@ make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
    any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^)

    ###
    +# Copy dependency data into .cmd file
    +# - gcc -M dependency info
    +# - command line to create object 'cmd_object :='
    +dep-cmd = cat $(depfile) > $(dot-target).cmd; \
    + printf '%s\n' 'cmd_$@ := $(make-cmd)' >> $(dot-target).cmd
    +
    +###
    # if_changed_dep - execute command if any prerequisite is newer than
    # target, or command line has changed and update
    # dependencies in the cmd file
    if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), \
    @set -e; \
    - $(echo-cmd) $(cmd_$(1)); \
    - cat $(depfile) > $(dot-target).cmd; \
    - printf '%s\n' 'cmd_$@ := $(make-cmd)' >> $(dot-target).cmd)
    + $(echo-cmd) $(cmd_$(1)) && $(dep-cmd))

    # if_changed - execute command if any prerequisite is newer than
    # target, or command line has changed

    \
     
     \ /
      Last update: 2015-09-29 11:01    [W:4.355 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site