Merge pull request #8159 from dcbaker/submit/all-env-variables-up-front

Read and store all environment variables up front

1 files changed, 2 insertions, 17 deletions

diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py
index 141c8fd..86e6aac 100644
--- a/mesonbuild/linkers.py
+++ b/mesonbuild/linkers.py
@@ -18,12 +18,11 @@ import typing as T
 
 from . import mesonlib
 from .arglist import CompilerArgs
-from .envconfig import get_env_var
 
 if T.TYPE_CHECKING:
     from .coredata import KeyedOptionDictType
-    from .envconfig import MachineChoice
     from .environment import Environment
+    from .mesonlib import MachineChoice
 
 
 class StaticLinker:
@@ -301,21 +300,7 @@ def evaluate_rpath(p: str, build_dir: str, from_dir: str) -> str:
     else:
         return os.path.relpath(os.path.join(build_dir, p), os.path.join(build_dir, from_dir))
 
-
-class LinkerEnvVarsMixin(metaclass=abc.ABCMeta):
-
-    """Mixin reading LDFLAGS from the environment."""
-
-    @staticmethod
-    def get_args_from_envvars(for_machine: mesonlib.MachineChoice,
-                              is_cross: bool) -> T.List[str]:
-        raw_value = get_env_var(for_machine, is_cross, 'LDFLAGS')
-        if raw_value is not None:
-            return mesonlib.split_args(raw_value)
-        else:
-            return []
-
-class DynamicLinker(LinkerEnvVarsMixin, metaclass=abc.ABCMeta):
+class DynamicLinker(metaclass=abc.ABCMeta):
 
     """Base class for dynamic linkers."""