X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=blobdiff_plain;f=dh;h=27733accbaa17e67f011c8b0e92e2606b18f6c8d;hp=4eae44484842008b71dc50dfcdd0c0a7f97a2a1b;hb=acdbeed0679cd7b7835a78ffc34814492e94a545;hpb=eb955ef0dafe25ac1cb8091c8f2a065d68e18916

diff --git a/dh b/dh
index 4eae444..27733ac 100755
--- a/dh
+++ b/dh
@@ -726,6 +726,13 @@ sub run_override {
 	return @rest if ! $has_explicit_target; # has empty override
 	return @rest unless @todo; # has override, but no packages to act on
 
+	if (defined $override_type) {
+		# Ensure appropriate -a or -i option is passed when running
+		# an arch-specific override target.
+		my $opt=$override_type eq "arch" ? "-a" : "-i";
+		push @options, $opt unless grep { $_ eq $opt } @options;
+	}
+
 	# This passes the options through to commands called
 	# inside the target.
 	$ENV{DH_INTERNAL_OPTIONS}=join("\x1e", @options);