mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pj/maint-ldflags'

Browse Source 
* pj/maint-ldflags:
  configure clobbers LDFLAGS
This commit is contained in:
Junio C Hamano
2009-01-13 23:09:38 -08:00
parent d83fd33bc1 50a4b35245
commit 788872395f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -127,7 +127,7 @@ else
SAVE_LDFLAGS="${LDFLAGS}" SAVE_LDFLAGS="${LDFLAGS}"
LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/" LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/"
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_wl_rpath=yes], [ld_wl_rpath=no]) 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 if test "$ld_wl_rpath" = "yes"; then
AC_SUBST(CC_LD_DYNPATH, [-Wl,-rpath,]) AC_SUBST(CC_LD_DYNPATH, [-Wl,-rpath,])
@ -136,7 +136,7 @@ else
SAVE_LDFLAGS="${LDFLAGS}" SAVE_LDFLAGS="${LDFLAGS}"
LDFLAGS="${SAVE_LDFLAGS} -rpath /" LDFLAGS="${SAVE_LDFLAGS} -rpath /"
AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_rpath=yes], [ld_rpath=no]) 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 if test "$ld_rpath" = "yes"; then
AC_SUBST(CC_LD_DYNPATH, [-rpath]) AC_SUBST(CC_LD_DYNPATH, [-rpath])