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

Mkae Autotools build_system point at correct build_directory (#48072)

Browse Source
This commit is contained in:
kwryankrattiger 2024-12-12 16:58:18 -06:00 committed by GitHub
parent e84631473c
commit 92dbb55703
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/build_systems/autotools.py
View File

@ -182,10 +182,7 @@ def patch_config_files(self) -> bool:
@property @property
def _removed_la_files_log(self) -> str: def _removed_la_files_log(self) -> str:
"""File containing the list of removed libtool archives""" """File containing the list of removed libtool archives"""
build_dir = self.build_directory return os.path.join(self.build_directory, "removed_la_files.txt")
if not os.path.isabs(self.build_directory):
build_dir = os.path.join(self.pkg.stage.path, build_dir)
return os.path.join(build_dir, "removed_la_files.txt")
@property @property
def archive_files(self) -> List[str]: def archive_files(self) -> List[str]:
@ -523,7 +520,12 @@ def configure_abs_path(self) -> str:
@property @property
def build_directory(self) -> str: def build_directory(self) -> str:
"""Override to provide another place to build the package""" """Override to provide another place to build the package"""
return self.configure_directory # Handle the case where the configure directory is set to a non-absolute path
# Non-absolute paths are always relative to the staging source path
build_dir = self.configure_directory
if not os.path.isabs(build_dir):
build_dir = os.path.join(self.pkg.stage.source_path, build_dir)
return build_dir
@spack.phase_callbacks.run_before("autoreconf") @spack.phase_callbacks.run_before("autoreconf")
def delete_configure_to_force_update(self) -> None: def delete_configure_to_force_update(self) -> None: