From: Alex Bennée <alex.bennee@linaro.org>
Date: Tue, 15 Sep 2020 13:43:13 +0000 (+0100)
Subject: configure: also skip deprecated targets with target-list-exclude
X-Git-Tag: qemu-xen-4.16.0-rc4~628^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3a5ae4a936c9b80ec137b569d08662ddbbd0c1a8;p=qemu-xen.git

configure: also skip deprecated targets with target-list-exclude

Now the user has to make an even more deliberate decision to
enable a deprecated target rather than getting it as a side effect of
using --target-exclude-list.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200915134317.11110-5-alex.bennee@linaro.org>
---

diff --git a/configure b/configure
index 51d03a8d34..f5fe48d6dd 100755
--- a/configure
+++ b/configure
@@ -1729,9 +1729,14 @@ if [ "$bsd_user" = "yes" ]; then
     mak_wilds="${mak_wilds} $source_path/default-configs/*-bsd-user.mak"
 fi
 
-if test -z "$target_list_exclude" -a -z "$target_list"; then
-    # if the user doesn't specify anything lets skip deprecating stuff
-    target_list_exclude=$deprecated_targets_list
+# If the user doesn't explicitly specify a deprecated target we will
+# skip it.
+if test -z "$target_list"; then
+    if test -z "$target_list_exclude"; then
+        target_list_exclude="$deprecated_targets_list"
+    else
+        target_list_exclude="$target_list_exclude,$deprecated_targets_list"
+    fi
 fi
 
 exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g')