microsoft#34 does not work correctly when host_triplet = target_triplet

strega-nil · May 5, 2021 · a7d3380 · a7d3380
1 parent 96ec678
commit a7d3380
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/vcpkg/commands.ci.cpp b/src/vcpkg/commands.ci.cpp
@@ -299,19 +299,22 @@ namespace vcpkg::Commands::CI
         const std::vector<FullPackageSpec>& specs,
         IBinaryProvider& binaryprovider,
         const Dependencies::CreateInstallPlanOptions& serialize_options,
+        Triplet target_triplet,
         Triplet host_triplet)
     {
         auto ret = std::make_unique<UnknownCIPortsResults>();
 
         auto is_excluded = [&](const PackageSpec& spec) -> bool {
+            bool excluded = false;
             if (spec.triplet() == host_triplet)
             {
-                return Util::Sets::contains(host_exclusions, spec.name());
+                excluded = excluded || Util::Sets::contains(host_exclusions, spec.name());
             }
-            else
+            if (spec.triplet() == target_triplet)
             {
-                return Util::Sets::contains(exclusions, spec.name());
+                excluded = excluded || Util::Sets::contains(exclusions, spec.name());
             }
+            return excluded;
         };
 
         std::set<PackageSpec> will_fail;
@@ -551,6 +554,7 @@ namespace vcpkg::Commands::CI
                                                      all_default_full_specs,
                                                      binaryprovider,
                                                      serialize_options,
+                                                     target_triplet,
                                                      host_triplet);
 
         auto& action_plan = split_specs->plan;