[PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH
- From
Øyvind A. Holm <sunny@sunbase.org>
- Date
- Oct 9, 2012, 16:36 UTC
- Message-ID
- <1349800572-2963-1-git-send-email-sunny@sunbase.org>
- 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