From 74a5d7478a5c0035df53823ba0c9167fce59f5e2 Mon Sep 17 00:00:00 2001 From: Noah Massey Date: Mon, 21 Mar 2016 10:16:07 -0400 Subject: [PATCH] btrfs-progs: build: fix static standalone utilities 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 Signed-off-by: David Sterba --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index dd306862..c553c5f0 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)