[PATCH] Link git-shell only to a subset of libgit.a
- From
Stephan Beyer <s-beyer@gmx.net>
- Date
- Jul 18, 2008, 01:04 UTC
- Message-ID
- <1216343070-20237-1-git-send-email-s-beyer@gmx.net>
- In-Reply-To
- <20080718005814.GA4155@spearce.org>
Commit 5b8e6f85 introduced stubs for three functions that make no sense for git-shell. But those stubs defined libgit.a functions a second time so that a linker can complain.
Now git-shell is only linked to a subset of libgit.a.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net> --- Hi Shawn,
does this compile on Solaris?
For Dmitry: this is even smaller, but not significant ;-)
Before: text data bss dec hex filename 24798 1304 8232 34334 861e git-shell
After: text data bss dec hex filename 24504 1264 8248 34016 84e0 git-shell
*hide&run* Stephan.
Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile index 4bec4b3..a5626dc 100644 --- a/Makefile +++ b/Makefile @@ -1204,6 +1204,9 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) +git-shell$X: compat/strlcpy.o abspath.o ctype.o exec_cmd.o quote.o strbuf.o usage.o wrapper.o shell.o + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) + $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) builtin-revert.o wt-status.o: wt-status.h
-- 1.5.6.3.390.g7b30