]> git.ipfire.org Git - thirdparty/git.git/commitdiff
configure.ac: Add missing comma to CC_LD_DYNPATH
authorØyvind A. Holm <sunny@sunbase.org>
Tue, 9 Oct 2012 14:26:11 +0000 (16:26 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Oct 2012 21:19:37 +0000 (14:19 -0700)
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>
configure.ac

index da1f41f58871b2102a9ed5eaeff7df3c9623f4bd..c85888c851c39d4ac88e1ba8b1a35a6f14a97ca7 100644 (file)
@@ -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}"