zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup errors introduced by Clingo Pr: (#32905)

Browse Source 
* re2c depends on cmake on Windows
* Winbison properly added to bootstrap package search list
This commit is contained in:
John W. Parent 2022-10-02 20:44:05 -04:00 committed by GitHub
parent fa7407093e
commit 5a0f4970df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/bootstrap.py
View File

@ -658,7 +658,7 @@ def _add_externals_if_missing():
spack.repo.path.get_pkg_class("gawk"), spack.repo.path.get_pkg_class("gawk"),
] ]
if is_windows: 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) detected_packages = spack.detection.by_executable(search_list)
spack.detection.update_configuration(detected_packages, scope="bootstrap") spack.detection.update_configuration(detected_packages, scope="bootstrap")

2
var/spack/repos/builtin/packages/re2c/package.py
View File

@ -28,6 +28,8 @@ class Re2c(Package):
phases = ["configure", "build", "install"] phases = ["configure", "build", "install"]
depends_on("cmake", when="platform=windows")
@property @property
def make_tool(self): def make_tool(self):
if is_windows: if is_windows: