Work around VC static initialization order issue

1 files changed, 10 insertions, 6 deletions

diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx
index d5a1565..14ab38c 100644
--- a/build2/config/operation.cxx
+++ b/build2/config/operation.cxx
@@ -381,14 +381,18 @@ namespace build2
              id < rs->operations.size ();
              ++id)
         {
-          const operation_info* oif (rs->operations[id]);
-          if (oif == nullptr)
-            continue;
+          if (const operation_info* oif = rs->operations[id])
+          {
+            // Skip aliases (e.g., update-for-install).
+            //
+            if (oif->id != id)
+              continue;
 
-          set_current_oif (*oif);
+            set_current_oif (*oif);
 
-          phase_lock pl (run_phase::match);
-          match (action (configure_id, id), t);
+            phase_lock pl (run_phase::match);
+            match (action (configure_id, id), t);
+          }
         }
 
         configure_project (a, *rs, projects);