From f24df6415586bd07fb5903fba3252495c4e5c065 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 20 Jun 2011 11:49:15 -0400
Subject: Revert "Always respect DEB_${flag}_{APPEND,SET} envvars."

This reverts commit fcfcd1298f6ea1fcfb2b2b5a529303270aa800d9.

Per Raphael's mail.
---
 Debian/Debhelper/Dh_Lib.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Debian/Debhelper/Dh_Lib.pm')

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 86f729ad..174970b0 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);
 		}
 	}
-- 
cgit v1.2.3