[PATCH] btrfs-progs: build: fix static standalone utilities

[PATCH] btrfs-progs: build: fix static standalone utilities

[Noah Massey]

commit b5e7979 "btrfs-progs: build: extend per-binary objects" allows
the standalone utilities to link against object files shared with the
main binary. However, the btrfs-*.static targets need to be adjusted
to build against the static versions of the common files.

Signed-off-by: Noah Massey <noah.massey@gmail.com>
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index dd30686..c553c5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -254,7 +254,7 @@ $(lib_links):
 btrfs-%.static: $(static_objects) btrfs-%.static.o $(static_libbtrfs_objects)
 	@echo "    [LD]     $@"
 	$(Q)$(CC) $(STATIC_CFLAGS) -o $@ $@.o $(static_objects) \
-		$($(subst -,_,$(subst .static,,$@)-objects)) \
+		$(patsubst %.o, %.static.o, $($(subst -,_,$(subst .static,,$@)-objects))) \
 		$(static_libbtrfs_objects) $(STATIC_LDFLAGS) \
 		$($(subst -,_,$(subst .static,,$@)-libs)) $(STATIC_LIBS)
 
-- 
2.7.0

Re: [PATCH] btrfs-progs: build: fix static standalone utilities

[David Sterba]

On Mon, Mar 21, 2016 at 10:16:07AM -0400, Noah Massey wrote:
> commit b5e7979 "btrfs-progs: build: extend per-binary objects" allows
> the standalone utilities to link against object files shared with the
> main binary. However, the btrfs-*.static targets need to be adjusted
> to build against the static versions of the common files.
> 
> Signed-off-by: Noah Massey <noah.massey@gmail.com>

Applied, thanks. I'll release a .1 version probably next week as there
are more build fixes accumulated.