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

Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Link: http:https://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
xiaomi-mt6789-devs · Jun 5, 2017 · ea59f30 · ea59f30
1 parent 6c8e648
commit ea59f30
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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