summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Dh_Lib.pm
diff options
context:
space:
mode:
authorModestas Vainius <modax@debian.org>2011-06-19 23:53:14 +0300
committerJoey Hess <joey@kitenet.net>2011-06-19 18:01:32 -0400
commitfcfcd1298f6ea1fcfb2b2b5a529303270aa800d9 (patch)
treed6196eff0e4e54fb73edf5c771610d904aa0483b /Debian/Debhelper/Dh_Lib.pm
parent1722a1bcfed9558cc438f3c0a1b9e024b46986cc (diff)
Always respect DEB_${flag}_{APPEND,SET} envvars.
Do that even when dpkg-buildpackage modifies environment variables. Also document DEB_${flag}_{APPEND,SET} as recommended way to override standard build flags.
Diffstat (limited to 'Debian/Debhelper/Dh_Lib.pm')
-rw-r--r--Debian/Debhelper/Dh_Lib.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 174970b..86f729a 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -917,7 +917,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}) {
+ if (! exists $ENV{$flag} || $buildflags->get_origin($flag) eq "env") {
$ENV{$flag} = $buildflags->get($flag);
}
}