From 04d803c79ca20e0a091c1c381fd78416f85cd979 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 10 Nov 2014 14:58:46 -0700 Subject: [PATCH] Use SSP_LDFLAGS when creating shared objects. --- lib/util/Makefile.in | 2 +- lib/zlib/Makefile.in | 2 +- plugins/group_file/Makefile.in | 2 +- plugins/sample/Makefile.in | 2 +- plugins/sudoers/Makefile.in | 2 +- plugins/system_group/Makefile.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index ead9e0d8c..d6d7bfa7d 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -136,7 +136,7 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@ *-no-install*) \ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) @LIBDL@;; \ *) \ - $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) -version-info $(SHLIB_VERSION) -rpath $(libexecdir)/sudo @LT_DEP_LIBS@ @LIBDL@;; \ + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) -version-info $(SHLIB_VERSION) -rpath $(libexecdir)/sudo @LT_DEP_LIBS@ @LIBDL@;; \ esac siglist.c: mksiglist diff --git a/lib/zlib/Makefile.in b/lib/zlib/Makefile.in index ca3e01d20..c188f0206 100644 --- a/lib/zlib/Makefile.in +++ b/lib/zlib/Makefile.in @@ -108,7 +108,7 @@ libsudo_z.la: $(LTOBJS) @LT_LDDEP@ *-no-install*) \ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(LT_LDFLAGS) $(LTOBJS);; \ *) \ - $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) -version-info $(SHLIB_VERSION) -rpath $(libexecdir)/sudo;; \ + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) -version-info $(SHLIB_VERSION) -rpath $(libexecdir)/sudo;; \ esac pre-install: diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in index 87a22d21a..12bfd4737 100644 --- a/plugins/group_file/Makefile.in +++ b/plugins/group_file/Makefile.in @@ -113,7 +113,7 @@ $(shlib_opt): $(shlib_exp) @$(SED) 's/^/+e /' $(shlib_exp) > $@ group_file.la: $(OBJS) $(LT_LIBS) @LT_LDDEP@ - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJS) $(LIBS) -module -avoid-version -rpath $(plugindir) -shrext .so + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJS) $(LIBS) -module -avoid-version -rpath $(plugindir) -shrext .so pre-install: diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index 0bd128379..ad7921e1c 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -112,7 +112,7 @@ $(shlib_opt): $(shlib_exp) @$(SED) 's/^/+e /' $(shlib_exp) > $@ sample_plugin.la: $(OBJS) @LT_LDDEP@ - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJS) $(LIBS) -module -avoid-version -rpath $(plugindir) -shrext .so + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJS) $(LIBS) -module -avoid-version -rpath $(plugindir) -shrext .so pre-install: diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index b85a0ae85..18d08c607 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -209,7 +209,7 @@ sudoers.la: $(SUDOERS_OBJS) $(LT_LIBS) libparsesudoers.la @LT_LDDEP@ *-no-install*) \ $(LIBTOOL) @LT_STATIC@ --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) -o $@ $(SUDOERS_OBJS) libparsesudoers.la $(SUDOERS_LIBS) -module;; \ *) \ - $(LIBTOOL) @LT_STATIC@ --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) -o $@ $(SUDOERS_OBJS) libparsesudoers.la $(SUDOERS_LIBS) -module -avoid-version -rpath $(plugindir) -shrext .so;; \ + $(LIBTOOL) @LT_STATIC@ --mode=link $(CC) $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) -o $@ $(SUDOERS_OBJS) libparsesudoers.la $(SUDOERS_LIBS) -module -avoid-version -rpath $(plugindir) -shrext .so;; \ esac visudo: libparsesudoers.la $(VISUDO_OBJS) $(LT_LIBS) diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in index 3345a29ac..39359f034 100644 --- a/plugins/system_group/Makefile.in +++ b/plugins/system_group/Makefile.in @@ -113,7 +113,7 @@ $(shlib_opt): $(shlib_exp) @$(SED) 's/^/+e /' $(shlib_exp) > $@ system_group.la: $(OBJS) $(LT_LIBS) @LT_LDDEP@ - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJS) $(LIBS) -module -avoid-version -rpath $(plugindir) -shrext .so + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJS) $(LIBS) -module -avoid-version -rpath $(plugindir) -shrext .so pre-install: -- 2.40.0