mirror of
https://github.com/sudo-project/sudo.git
synced 2025-08-22 01:49:11 +00:00
Back out the --with-libpath addition to SUDOERS_LDFLAGS since that
now include LDFLAGS in the sudoers Makefile.in. Add missing settng of @LDFLAGS@ in plugin Makefile.in files.
This commit is contained in:
parent
dc19e4dff1
commit
89cd8c2ff1
15
configure
vendored
15
configure
vendored
@ -13556,21 +13556,6 @@ if test -n "$with_libpath"; then
|
||||
blibpath_add="${blibpath_add}:$i"
|
||||
fi
|
||||
|
||||
|
||||
if test X"$with_rpath" = X"yes"; then
|
||||
case "$host" in
|
||||
*-*-hpux*) SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} -L$i -Wl,+b,$i"
|
||||
;;
|
||||
*) SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} -L$i -Wl,-R$i"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} -L$i"
|
||||
fi
|
||||
if test X"$blibpath" != X"" -a "SUDOERS_LDFLAGS" = "SUDO_LDFLAGS"; then
|
||||
blibpath_add="${blibpath_add}:$i"
|
||||
fi
|
||||
|
||||
done
|
||||
fi
|
||||
if test -n "$with_libraries"; then
|
||||
|
@ -1845,7 +1845,6 @@ dnl
|
||||
if test -n "$with_libpath"; then
|
||||
for i in ${with_libpath}; do
|
||||
SUDO_APPEND_LIBPATH(LDFLAGS, [$i])
|
||||
SUDO_APPEND_LIBPATH(SUDOERS_LDFLAGS, [$i])
|
||||
done
|
||||
fi
|
||||
if test -n "$with_libraries"; then
|
||||
|
@ -42,7 +42,7 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) @CPPFLAGS@
|
||||
CFLAGS = @CFLAGS@
|
||||
|
||||
# Flags to pass to the link stage
|
||||
LDFLAGS =
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LTLDFLAGS = @LTLDFLAGS@
|
||||
|
||||
# Where to install things...
|
||||
|
@ -42,7 +42,7 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) @CPPFLAGS@
|
||||
CFLAGS = @CFLAGS@
|
||||
|
||||
# Flags to pass to the link stage
|
||||
LDFLAGS =
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LTLDFLAGS = @LTLDFLAGS@
|
||||
|
||||
# Where to install things...
|
||||
|
@ -55,8 +55,8 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
|
||||
CFLAGS = @CFLAGS@
|
||||
|
||||
# Flags to pass to the link stage
|
||||
LDFLAGS =
|
||||
SUDOERS_LDFLAGS = @SUDOERS_LDFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
SUDOERS_LDFLAGS = @LDFLAGS@ @SUDOERS_LDFLAGS@
|
||||
LTLDFLAGS = @LTLDFLAGS@
|
||||
|
||||
# Where to install things...
|
||||
|
Loading…
x
Reference in New Issue
Block a user