Mercurial > hg > nginx
changeset 6700:0d2956dfc4e6
Perl: pass additional linker options to perl module.
Previously flags passed by --with-ld-opt were not used when building perl
module, which meant hardening flags provided by package build systems were not
applied.
author | Konstantin Pavlov <thresh@nginx.com> |
---|---|
date | Tue, 20 Sep 2016 22:11:23 +0300 |
parents | 9cf2dce316e5 |
children | d69964eb8335 |
files | auto/lib/perl/conf auto/lib/perl/make auto/make src/http/modules/perl/Makefile.PL |
diffstat | 4 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/lib/perl/conf Tue Sep 20 15:07:16 2016 +0300 +++ b/auto/lib/perl/conf Tue Sep 20 22:11:23 2016 +0300 @@ -28,8 +28,10 @@ exit 1; fi + NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts` + NGX_PM_LDFLAGS=`$NGX_PERL -MConfig -e 'print $Config{lddlflags}'` + NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`" - NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts` # gcc 4.1/4.2 warn about unused values in pTHX_ NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \
--- a/auto/lib/perl/make Tue Sep 20 15:07:16 2016 +0300 +++ b/auto/lib/perl/make Tue Sep 20 22:11:23 2016 +0300 @@ -35,6 +35,7 @@ cd $NGX_OBJS/src/http/modules/perl \\ && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\ + NGX_PM_LDFLAGS="$NGX_LD_OPT \$(NGX_PM_LDFLAGS)" \\ NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\ NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\ $NGX_PERL Makefile.PL \\
--- a/auto/make Tue Sep 20 15:07:16 2016 +0300 +++ b/auto/make Tue Sep 20 22:11:23 2016 +0300 @@ -31,6 +31,7 @@ if test -n "$NGX_PERL_CFLAGS"; then echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS >> $NGX_MAKEFILE echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS >> $NGX_MAKEFILE + echo NGX_PM_LDFLAGS = $NGX_PM_LDFLAGS >> $NGX_MAKEFILE fi
--- a/src/http/modules/perl/Makefile.PL Tue Sep 20 15:07:16 2016 +0300 +++ b/src/http/modules/perl/Makefile.PL Tue Sep 20 22:11:23 2016 +0300 @@ -16,6 +16,8 @@ CCFLAGS => "$ENV{NGX_PM_CFLAGS}", OPTIMIZE => '-O', + LDDLFLAGS => "$ENV{NGX_PM_LDFLAGS}", + INC => join(" ", map { m#^/# ? "-I $_" : "-I ../../../../../$_" } (split /\s+/, $ENV{NGX_INCS})),