diff options
| author |  Øyvind A. Holm <sunny@sunbase.org> | 2012-10-09 16:26:11 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-10-09 14:19:37 -0700 |
| commit | 9979a507c56c647353ac6e2d9dd1ceb21a5f25d7 (patch) | |
| tree | 8071043a0f66aff0e0bb7817a3876278a0c1ea34 | |
| parent | Git 1.8.0-rc1 (diff) | |
| download | tgif-9979a507c56c647353ac6e2d9dd1ceb21a5f25d7.tar.xz | |
configure.ac: Add missing comma to CC_LD_DYNPATH
40bfbde ("build: don't duplicate substitution of make variables",
2012-09-11) by mistake removed a necessary comma at the end of
"CC_LD_DYNPATH=-Wl,rpath," in line 414.
When executing "./configure --with-zlib=PATH", this resulted in
[...]
CC xdiff/xhistogram.o
AR xdiff/lib.a
LINK git-credential-store
/usr/bin/ld: bad -rpath option
collect2: ld returned 1 exit status
make: *** [git-credential-store] Error 1
$
during make.
Signed-off-by: Øyvind A. Holm <sunny@sunbase.org>
Acked-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index da1f41f588..c85888c851 100644 --- a/configure.ac +++ b/configure.ac @@ -411,7 +411,7 @@ else LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_wl_rpath" = "yes"; then - CC_LD_DYNPATH=-Wl,-rpath + CC_LD_DYNPATH=-Wl,-rpath, else AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" |