summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Buildsystem
diff options
context:
space:
mode:
authorDominic Hargreaves <dom@earth.li>2012-03-05 16:02:15 +0000
committerJoey Hess <joey@kitenet.net>2012-03-11 18:23:20 -0400
commit798e7eb1659e8a1fab0e171a8f77d097f0d18694 (patch)
treebdaefe95ae173db83230154a10ea8c6ccad69992 /Debian/Debhelper/Buildsystem
parent5c72e00a9378684874663c1eb8579cc57a2b2bc3 (diff)
Pass CPPFLAGS and LDFLAGS to Makefile.PL and Build.PL
Diffstat (limited to 'Debian/Debhelper/Buildsystem')
-rw-r--r--Debian/Debhelper/Buildsystem/perl_build.pm6
-rw-r--r--Debian/Debhelper/Buildsystem/perl_makemaker.pm6
2 files changed, 10 insertions, 2 deletions
diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 724e1e0..35a23d6 100644
--- 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 722a12a..342e0eb 100644
--- 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",