lkml.org 
[lkml]   [2017]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:locking/core] tools/lib/lockdep: Fix object file paths used in an out-of-tree build
    Commit-ID:  ea59f30d6a30c4c0ef54d1e19ac70c35b6ef91b6
    Gitweb: http://git.kernel.org/tip/ea59f30d6a30c4c0ef54d1e19ac70c35b6ef91b6
    Author: Ben Hutchings <ben@decadent.org.uk>
    AuthorDate: Thu, 25 May 2017 12:58:48 +0000
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Mon, 5 Jun 2017 09:28:09 +0200

    tools/lib/lockdep: Fix object file paths used in an out-of-tree build

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: a.p.zijlstra@chello.nl
    Link: http://lkml.kernel.org/r/20170525130005.5947-14-alexander.levin@verizon.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    tools/lib/lockdep/Makefile | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
    index 98d8a5ae..e5e64d6 100644
    --- a/tools/lib/lockdep/Makefile
    +++ b/tools/lib/lockdep/Makefile
    @@ -101,7 +101,7 @@ include $(srctree)/tools/build/Makefile.include

    do_compile_shared_library = \
    ($(print_shared_lib_compile) \
    - $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$@"';$(shell ln -sf $@ liblockdep.so))
    + $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$(@F)"';$(shell ln -sf $(@F) $(@D)/liblockdep.so))

    do_build_static_lib = \
    ($(print_static_lib_build) \
    @@ -119,10 +119,10 @@ all_cmd: $(CMD_TARGETS)
    $(LIB_IN): force
    $(Q)$(MAKE) $(build)=liblockdep

    -liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN)
    +$(OUTPUT)liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN)
    $(Q)$(do_compile_shared_library)

    -liblockdep.a: $(LIB_IN)
    +$(OUTPUT)liblockdep.a: $(LIB_IN)
    $(Q)$(do_build_static_lib)

    tags: force
    @@ -150,7 +150,7 @@ install_lib: all_cmd
    install: install_lib

    clean:
    - $(RM) *.o *~ $(TARGETS) *.a *liblockdep*.so* $(VERSION_FILES) .*.d .*.cmd
    + $(RM) $(OUTPUT)*.o *~ $(TARGETS) $(OUTPUT)*.a $(OUTPUT)*liblockdep*.so* $(VERSION_FILES) $(OUTPUT).*.d $(OUTPUT).*.cmd
    $(RM) tags TAGS

    PHONY += force
    \
     
     \ /
      Last update: 2017-06-05 11:37    [W:2.191 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site