From 5a0f4970df9e97afe22ce4d8f02cf5427da381ae Mon Sep 17 00:00:00 2001
From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com>
Date: Sun, 2 Oct 2022 20:44:05 -0400
Subject: Fixup errors introduced by Clingo Pr: (#32905)

* re2c depends on cmake on Windows
* Winbison properly added to bootstrap package search list
---
 lib/spack/spack/bootstrap.py                     | 2 +-
 var/spack/repos/builtin/packages/re2c/package.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/spack/spack/bootstrap.py b/lib/spack/spack/bootstrap.py
index cfcaac2a31..2e0f2614e7 100644
--- a/lib/spack/spack/bootstrap.py
+++ b/lib/spack/spack/bootstrap.py
@@ -658,7 +658,7 @@ def _add_externals_if_missing():
         spack.repo.path.get_pkg_class("gawk"),
     ]
     if is_windows:
-        search_list.extend(spack.repo.path.get_pkg_class("winbison"))
+        search_list.append(spack.repo.path.get_pkg_class("winbison"))
     detected_packages = spack.detection.by_executable(search_list)
     spack.detection.update_configuration(detected_packages, scope="bootstrap")
 
diff --git a/var/spack/repos/builtin/packages/re2c/package.py b/var/spack/repos/builtin/packages/re2c/package.py
index 19d55bfc35..eae59ed679 100644
--- a/var/spack/repos/builtin/packages/re2c/package.py
+++ b/var/spack/repos/builtin/packages/re2c/package.py
@@ -28,6 +28,8 @@ class Re2c(Package):
 
     phases = ["configure", "build", "install"]
 
+    depends_on("cmake", when="platform=windows")
+
     @property
     def make_tool(self):
         if is_windows:
-- 
cgit v1.2.3-60-g2f50