summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Dh_Lib.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-20 11:49:15 -0400
committerJoey Hess <joey@kitenet.net>2011-06-20 11:49:15 -0400
commitf24df6415586bd07fb5903fba3252495c4e5c065 (patch)
tree21d47990dbf27097425df37dee14c5a996572320 /Debian/Debhelper/Dh_Lib.pm
parent031319820566968f4f44f003cd2313062231da46 (diff)
Revert "Always respect DEB_${flag}_{APPEND,SET} envvars."
This reverts commit fcfcd1298f6ea1fcfb2b2b5a529303270aa800d9. Per Raphael's mail.
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 86f729a..174970b 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} || $buildflags->get_origin($flag) eq "env") {
+ if (! exists $ENV{$flag}) {
$ENV{$flag} = $buildflags->get($flag);
}
}