dpkg-buildflags is only used to set environment in v9

[debhelper.git] / Debian / Debhelper / Dh_Lib.pm

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 86f729adab3f1ea2fe8e7a0db38d2c518418d090..5a7c3e4a696172de077ba3f387241d0fa162517b 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -903,8 +903,7 @@ sub cross_command {
 # Sets environment variables from dpkg-buildflags. Avoids changing
 # any existing environment variables.
 sub set_buildflags {
-       # optimisation
-       return if $ENV{DH_INTERNAL_BUILDFLAGS};
+       return if $ENV{DH_INTERNAL_BUILDFLAGS} || compat(8);
        $ENV{DH_INTERNAL_BUILDFLAGS}=1;
 
        eval "use Dpkg::BuildFlags";
@@ -917,7 +916,7 @@ sub set_buildflags {
        $buildflags->load_config();
        foreach my $flag ($buildflags->list()) {
                next unless $flag =~ /^[A-Z]/; # Skip flags starting with lowercase
-               if (! exists $ENV{$flag} || $buildflags->get_origin($flag) eq "env") {
+               if (! exists $ENV{$flag}) {
                        $ENV{$flag} = $buildflags->get($flag);
                }
        }