From: Noah Massey <nmassey@kmbs.konicaminolta.us>
To: linux-btrfs@vger.kernel.org
Cc: David Sterba <dsterba@suse.com>, Noah Massey <noah.massey@gmail.com>
Subject: [PATCH] btrfs-progs: build: fix static standalone utilities
Date: Mon, 21 Mar 2016 10:16:07 -0400 [thread overview]
Message-ID: <1458569767-6432-1-git-send-email-noah.massey@gmail.com> (raw)
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
next reply other threads:[~2016-03-21 14:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-21 14:16 Noah Massey [this message]
2016-03-22 15:08 ` [PATCH] btrfs-progs: build: fix static standalone utilities David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458569767-6432-1-git-send-email-noah.massey@gmail.com \
--to=nmassey@kmbs.konicaminolta.us \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=noah.massey@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).