git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Øyvind A. Holm" <sunny@sunbase.org>
To: git@vger.kernel.org
Cc: stefano.lattarini@gmail.com, gitster@pobox.com,
	" Øyvind A. Holm " <sunny@sunbase.org>
Subject: [PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH
Date: Tue,  9 Oct 2012 18:36:12 +0200	[thread overview]
Message-ID: <1349800572-2963-1-git-send-email-sunny@sunbase.org> (raw)
In-Reply-To: <1349800026-10717-1-git-send-email-sunny@sunbase.org>

From: "Øyvind A. Holm" <sunny@sunbase.org>

40bfbde ("build: don't duplicate substitution of make variables",
2012-09-11) breaks make by removing a necessary comma at the end of
"CC_LD_DYNPATH=-rpath" in line 414 and 423.

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>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index da1f41f..ea79ea2 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}"
@@ -420,7 +420,7 @@ else
          LDFLAGS="${SAVE_LDFLAGS}"
       ])
       if test "$git_cv_ld_rpath" = "yes"; then
-         CC_LD_DYNPATH=-rpath
+         CC_LD_DYNPATH=-rpath,
       else
          CC_LD_DYNPATH=
          AC_MSG_WARN([linker does not support runtime path to dynamic libraries])
-- 
1.8.0.rc1

       reply	other threads:[~2012-10-09 16:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1349800026-10717-1-git-send-email-sunny@sunbase.org>
2012-10-09 16:36 ` Øyvind A. Holm [this message]
2012-10-09 16:40   ` [PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH Øyvind A. Holm
     [not found]   ` <7v4nm3h8yr.fsf@alter.siamese.dyndns.org>
2012-10-09 17:23     ` Øyvind A. Holm
2012-10-09 21:10   ` Stefano Lattarini
2012-10-09 14:26 Øyvind A. Holm

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=1349800572-2963-1-git-send-email-sunny@sunbase.org \
    --to=sunny@sunbase.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=stefano.lattarini@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).