Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1643714

[PATCH 13/15] tools: liblockdep: Fix object file paths used in an out-of-tree build

From alexander.levin@verizon.com
Newsgroups linux.kernel
Subject [PATCH 13/15] tools: liblockdep: Fix object file paths used in an out-of-tree build
Date 2017-05-18 02:20 +0200
Message-ID <tIhkB-1NU-7@gated-at.bofh.it> (permalink)
References <tIhaV-1Ks-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Ben Hutchings <ben@decadent.org.uk>

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 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 98d8a5ae8334..e5e64d6ad0a7 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
-- 
2.11.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 01/15] liblockdep: Fix undefined symbol prandom_u32 alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 02/15] liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing  lock_chain::depth alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 10/15] tools: add install make target for liblockdep alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 12/15] tools: liblockdep: fix compilation for 4.11 alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 15/15] tools: liblockdep: Use LDFLAGS alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 08/15] liblockdep: Remove -lpthread compiler option alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 09/15] MAINTAINERS: update email for Sasha Levin alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 03/15] liblockdep: Define the ARRAY_SIZE() macro alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 14/15] tools: liblockdep: Remove double-quotes from soname alexander.levin@verizon.com - 2017-05-18 02:10 +0200
  [PATCH 04/15] liblockdep: Enable -Wall by default alexander.levin@verizon.com - 2017-05-18 02:20 +0200
  [PATCH 07/15] liblockdep: Fix 'defined but not used' warning for  init_utsname() alexander.levin@verizon.com - 2017-05-18 02:20 +0200
  [PATCH 13/15] tools: liblockdep: Fix object file paths used in an  out-of-tree build alexander.levin@verizon.com - 2017-05-18 02:20 +0200
  [PATCH 11/15] tools: liblockdep: Don't mix fd-based and stream IO alexander.levin@verizon.com - 2017-05-18 02:20 +0200
  [PATCH 06/15] liblockdep: Fix 'set but not used' warnings alexander.levin@verizon.com - 2017-05-18 02:20 +0200
  Re: [PATCH 01/15] liblockdep: Fix undefined symbol prandom_u32 Ingo Molnar <mingo@kernel.org> - 2017-05-24 10:00 +0200

csiph-web