Pass CPPFLAGS and LDFLAGS to Makefile.PL and Build.PL

diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 724e1e07fa63bfb0d2be16873aaf4eabdc771945..35a23d675b12bd620855206d38ee9eb768ad727a 100644 (file)
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -9,6 +9,7 @@ package Debian::Debhelper::Buildsystem::perl_build;
 use strict;
 use Debian::Debhelper::Dh_Lib qw(compat);
 use base 'Debian::Debhelper::Buildsystem';
+use Config;
 
 sub DESCRIPTION {
        "Perl Module::Build (Build.PL)"
@@ -42,7 +43,10 @@ sub configure {
        my @flags;
        $ENV{PERL_MM_USE_DEFAULT}=1;
        if ($ENV{CFLAGS} && ! compat(8)) {
-               push @flags, "config=optimize=$ENV{CFLAGS}";
+               push @flags, "config=optimize=$ENV{CFLAGS} $ENV{CPPFLAGS}";
+       }
+       if ($ENV{LDFLAGS} && ! compat(8)) {
+               push @flags, "config=ld=$Config{ld} $ENV{LDFLAGS}";
        }
        $this->do_perl("Build.PL", "installdirs=vendor", @flags, @_);
 }

diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 722a12a350252adaeb6d7fdb0b4a351cfce33b58..342e0eb8e1e0026b3d6307e0181824b54169fd74 100644 (file)
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -9,6 +9,7 @@ package Debian::Debhelper::Buildsystem::perl_makemaker;
 use strict;
 use Debian::Debhelper::Dh_Lib qw(compat);
 use base 'Debian::Debhelper::Buildsystem::makefile';
+use Config;
 
 sub DESCRIPTION {
        "Perl ExtUtils::MakeMaker (Makefile.PL)"
@@ -47,7 +48,10 @@ sub configure {
        $ENV{PERL_AUTOINSTALL}="--skipdeps";
 
        if ($ENV{CFLAGS} && ! compat(8)) {
-               push @flags, "OPTIMIZE=$ENV{CFLAGS}";
+               push @flags, "OPTIMIZE=$ENV{CFLAGS} $ENV{CPPFLAGS}";
+       }
+       if ($ENV{LDFLAGS} && ! compat(8)) {
+               push @flags, "LD=$Config{ld} $ENV{LDFLAGS}";
        }
 
        $this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor",