From b07d38b3be43391186ee785f634ec73eab50c4e9 Mon Sep 17 00:00:00 2001
From: Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de>
Date: Mon, 29 Jun 2020 17:08:22 +0200
Subject: [PATCH] autotools: Fix config.guess detection (#17149)
The config.guess detection used a relative path that did not work in
combination with `check_call`. Use an absolute path instead.
---
lib/spack/spack/build_systems/autotools.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py
index 72a2c0afbb..27a3ee7657 100644
--- a/lib/spack/spack/build_systems/autotools.py
+++ b/lib/spack/spack/build_systems/autotools.py
@@ -118,13 +118,15 @@ def _do_patch_config_files(self):
config_file = 'config.{0}'.format(config_name)
if os.path.exists(config_file):
# First search the top-level source directory
- my_config_files[config_name] = config_file
+ my_config_files[config_name] = os.path.join(
+ self.configure_directory, config_file)
else:
# 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)
- for r, ds, fs in os.walk('.') for f in fs
+ for r, ds, fs in os.walk(
+ self.configure_directory) for f in fs
if f == config_file), None)
my_config_files[config_name] = config_path
--
GitLab