From bc53bb9b7cbf250c98cfe77d334ed30d6b958c21 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Wed, 24 Jun 2020 17:39:04 +0200 Subject: Unset environment variables that are most commonly used by Autotools packages. (#8623) --- lib/spack/spack/build_environment.py | 12 ++++++++++++ lib/spack/spack/util/environment.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index f997110b4c..8a063377a7 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -162,6 +162,18 @@ def clean_environment(): if 'PKGCONF' in varname: env.unset(varname) + # Unset the following variables because they can affect installation of + # Autotools and CMake packages. + build_system_vars = [ + 'CC', 'CFLAGS', 'CPP', 'CPPFLAGS', # C variables + 'CXX', 'CCC', 'CXXFLAGS', 'CXXCPP', # C++ variables + 'F77', 'FFLAGS', 'FLIBS', # Fortran77 variables + 'FC', 'FCFLAGS', 'FCLIBS', # Fortran variables + 'LDFLAGS', 'LIBS' # linker variables + ] + for v in build_system_vars: + env.unset(v) + build_lang = spack.config.get('config:build_language') if build_lang: # Override language-related variables. This can be used to force diff --git a/lib/spack/spack/util/environment.py b/lib/spack/spack/util/environment.py index 8069f51431..3d69efa5ca 100644 --- a/lib/spack/spack/util/environment.py +++ b/lib/spack/spack/util/environment.py @@ -376,7 +376,7 @@ class EnvironmentModifications(object): """Stores a request to unset an environment variable. Args: - name: name of the environment variable to be set + name: name of the environment variable to be unset """ kwargs.update(self._get_outside_caller_attributes()) item = UnsetEnv(name, **kwargs) -- cgit v1.2.3-60-g2f50