aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2017-05-25 08:58:48 -0400
committerIngo Molnar <mingo@kernel.org>2017-06-05 03:28:09 -0400
commitea59f30d6a30c4c0ef54d1e19ac70c35b6ef91b6 (patch)
treeeb71aa27184e969706b309b4614eba0927dc70fa
parent6c8e6483850e7a7e44fd584790969c308887c468 (diff)
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>
-rw-r--r--tools/lib/lockdep/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index 98d8a5ae8334..e5e64d6ad0a7 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -101,7 +101,7 @@ include $(srctree)/tools/build/Makefile.include
101 101
102do_compile_shared_library = \ 102do_compile_shared_library = \
103 ($(print_shared_lib_compile) \ 103 ($(print_shared_lib_compile) \
104 $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$@"';$(shell ln -sf $@ liblockdep.so)) 104 $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$(@F)"';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
105 105
106do_build_static_lib = \ 106do_build_static_lib = \
107 ($(print_static_lib_build) \ 107 ($(print_static_lib_build) \
@@ -119,10 +119,10 @@ all_cmd: $(CMD_TARGETS)
119$(LIB_IN): force 119$(LIB_IN): force
120 $(Q)$(MAKE) $(build)=liblockdep 120 $(Q)$(MAKE) $(build)=liblockdep
121 121
122liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN) 122$(OUTPUT)liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN)
123 $(Q)$(do_compile_shared_library) 123 $(Q)$(do_compile_shared_library)
124 124
125liblockdep.a: $(LIB_IN) 125$(OUTPUT)liblockdep.a: $(LIB_IN)
126 $(Q)$(do_build_static_lib) 126 $(Q)$(do_build_static_lib)
127 127
128tags: force 128tags: force
@@ -150,7 +150,7 @@ install_lib: all_cmd
150install: install_lib 150install: install_lib
151 151
152clean: 152clean:
153 $(RM) *.o *~ $(TARGETS) *.a *liblockdep*.so* $(VERSION_FILES) .*.d .*.cmd 153 $(RM) $(OUTPUT)*.o *~ $(TARGETS) $(OUTPUT)*.a $(OUTPUT)*liblockdep*.so* $(VERSION_FILES) $(OUTPUT).*.d $(OUTPUT).*.cmd
154 $(RM) tags TAGS 154 $(RM) tags TAGS
155 155
156PHONY += force 156PHONY += force