From 4e4de51f0d4ac7b08cb30e5d7de7ec726432fbca Mon Sep 17 00:00:00 2001
From: Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de>
Date: Mon, 6 Jul 2020 19:53:02 +0200
Subject: [PATCH] autotools bugfix: handle missing config.guess (#17356)
Spack was attempting to calculate abspath on the located config.guess
path even when it was not found (None); this commit skips the abspath
calculation when config.guess is not found.
---
lib/spack/spack/build_systems/autotools.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py
index f07a2169ac..1ea238e2d1 100644
--- a/lib/spack/spack/build_systems/autotools.py
+++ b/lib/spack/spack/build_systems/autotools.py
@@ -123,10 +123,10 @@ def _do_patch_config_files(self):
# Then search in all sub directories recursively.
# We would like to use AC_CONFIG_AUX_DIR, but not all packages
# ship with their configure.in or configure.ac.
- config_path = next((os.path.join(r, f)
+ config_path = next((os.path.abspath(os.path.join(r, f))
for r, ds, fs in os.walk('.') for f in fs
if f == config_file), None)
- my_config_files[config_name] = os.path.abspath(config_path)
+ my_config_files[config_name] = config_path
if my_config_files[config_name] is not None:
try:
--
GitLab