2015-08-14 12:34:43 +00:00
|
|
|
From: Ben Hutchings <ben@decadent.org.uk>
|
|
|
|
Date: Thu, 13 Aug 2015 20:48:12 +0200
|
|
|
|
Subject: liblockdep: Fix object file paths used in an out-of-tree build
|
|
|
|
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
|
|
---
|
2015-08-13 18:48:12 +00:00
|
|
|
--- a/tools/lib/lockdep/Makefile
|
|
|
|
+++ b/tools/lib/lockdep/Makefile
|
2016-02-18 03:19:23 +00:00
|
|
|
@@ -100,7 +100,7 @@ include $(srctree)/tools/build/Makefile.
|
2015-08-13 18:48:12 +00:00
|
|
|
|
|
|
|
do_compile_shared_library = \
|
|
|
|
($(print_shared_lib_compile) \
|
|
|
|
- $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$@"';$(shell ln -s $@ liblockdep.so))
|
|
|
|
+ $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$(@F)"';$(shell ln -s $(@F) $(@D)/liblockdep.so))
|
|
|
|
|
|
|
|
do_build_static_lib = \
|
|
|
|
($(print_static_lib_build) \
|
2016-02-18 03:19:23 +00:00
|
|
|
@@ -118,10 +118,10 @@ all_cmd: $(CMD_TARGETS)
|
2015-08-13 18:48:12 +00:00
|
|
|
$(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
|
2016-02-18 03:19:23 +00:00
|
|
|
@@ -149,7 +149,7 @@ install_lib: all_cmd
|
2015-08-13 18:48:12 +00:00
|
|
|
install: install_lib
|
|
|
|
|
|
|
|
clean:
|
2016-02-18 03:19:23 +00:00
|
|
|
- $(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
|
2015-08-13 18:48:12 +00:00
|
|
|
$(RM) tags TAGS
|
|
|
|
|
|
|
|
PHONY += force
|