Also include CFLAGS in ld line for perl. Closes: #662666

[debhelper.git] / Debian / Debhelper / Buildsystem / perl_makemaker.pm

diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index a9c7fac1ecc3872f303643d88e4de9e7fb13afdf..60cda3d02e0a2b1aeb7f00a237fc56695d0e61d8 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)"
@@ -46,8 +47,11 @@ sub configure {
        # This prevents  Module::Install from interactive behavior.
        $ENV{PERL_AUTOINSTALL}="--skipdeps";
 
-       if ($ENV{CFLAGS}) {
-               push @flags, "OPTIMIZE=$ENV{CFLAGS}";
+       if ($ENV{CFLAGS} && ! compat(8)) {
+               push @flags, "OPTIMIZE=$ENV{CFLAGS} $ENV{CPPFLAGS}";
+       }
+       if ($ENV{LDFLAGS} && ! compat(8)) {
+               push @flags, "LD=$Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS}";
        }
 
        $this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor",