diff options
| author | Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de> | 2020-07-06 19:53:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 10:53:02 -0700 |
| commit | 516c3e659f3af89912edeb5209a1d1584c345545 (patch) | |
| tree | e72daca948bf64cf0b74e0d6ae484f1e7d14df22 /lib | |
| parent | e62ddcb5823133ce20ff6c00084f71b3bde28992 (diff) | |
| download | spack-516c3e659f3af89912edeb5209a1d1584c345545.tar.gz spack-516c3e659f3af89912edeb5209a1d1584c345545.tar.bz2 spack-516c3e659f3af89912edeb5209a1d1584c345545.tar.xz spack-516c3e659f3af89912edeb5209a1d1584c345545.zip | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/build_systems/autotools.py | 4 |
1 files 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 @@ class AutotoolsPackage(PackageBase): # 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: |