Merge branch 'pj/maint-ldflags' into maint

* pj/maint-ldflags: configure clobbers LDFLAGS

Merge branch 'pj/maint-ldflags' into maint
* pj/maint-ldflags: configure clobbers LDFLAGS
67b175bb · Junio C Hamano · e5bde198 · 50a4b352 · 67b175bb
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

configure.ac configure.ac +2 -2

未找到文件。
--- 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])