diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-13 23:09:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 23:09:38 -0800 |
| commit | 788872395f88b64159c30ca73d61923facd84217 (patch) | |
| tree | 558de56a9b9f4f08a294887dfc6c6c0f50024421 | |
| parent | d83fd33bc14512afdd0d5b8e1d0fe46311531e2e (diff) | |
| parent | 50a4b35245bbdb0cfca5d62bc4295a2b2e4f1e87 (diff) | |
| download | git-788872395f88b64159c30ca73d61923facd84217.tar.gz git-788872395f88b64159c30ca73d61923facd84217.tar.xz | |
Merge branch 'pj/maint-ldflags'
* pj/maint-ldflags:
configure clobbers LDFLAGS
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 8821b5080..0a5fc8c6f 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,7 @@ else SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/" AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_wl_rpath=yes], [ld_wl_rpath=no]) - LDFLAGS="${SAVE_LD_FLAGS}" + LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$ld_wl_rpath" = "yes"; then AC_SUBST(CC_LD_DYNPATH, [-Wl,-rpath,]) @@ -136,7 +136,7 @@ else SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -rpath /" AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_rpath=yes], [ld_rpath=no]) - LDFLAGS="${SAVE_LD_FLAGS}" + LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$ld_rpath" = "yes"; then AC_SUBST(CC_LD_DYNPATH, [-rpath]) |