summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mesonbuild/dependencies/base.py14
-rw-r--r--mesonbuild/dependencies/boost.py2
-rw-r--r--mesonbuild/dependencies/cmake.py4
-rw-r--r--mesonbuild/dependencies/coarrays.py3
-rw-r--r--mesonbuild/dependencies/cuda.py2
-rw-r--r--mesonbuild/dependencies/detect.py7
-rw-r--r--mesonbuild/dependencies/dev.py4
-rw-r--r--mesonbuild/dependencies/dub.py2
-rw-r--r--mesonbuild/dependencies/factory.py12
-rw-r--r--mesonbuild/dependencies/hdf5.py9
-rw-r--r--mesonbuild/dependencies/misc.py2
-rw-r--r--mesonbuild/dependencies/mpi.py3
-rw-r--r--mesonbuild/dependencies/python.py2
-rw-r--r--mesonbuild/interpreter/compiler.py3
-rw-r--r--mesonbuild/interpreter/dependencyfallbacks.py8
-rw-r--r--mesonbuild/mdevenv.py2
-rw-r--r--mesonbuild/modules/_qt.py4
-rw-r--r--mesonbuild/modules/python.py4
-rw-r--r--unittests/allplatformstests.py2
-rw-r--r--unittests/internaltests.py2
-rw-r--r--unittests/linuxliketests.py4
21 files changed, 47 insertions, 48 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 293f772a8..5e0d871ef 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -21,7 +21,7 @@ from ..options import OptionKey
#from ..interpreterbase import FeatureDeprecated, FeatureNew
if T.TYPE_CHECKING:
- from typing_extensions import Literal, TypedDict, TypeAlias
+ from typing_extensions import Literal, Required, TypedDict, TypeAlias
from ..compilers.compilers import Compiler
from ..environment import Environment
@@ -51,7 +51,7 @@ if T.TYPE_CHECKING:
main: bool
method: DependencyMethods
modules: T.List[str]
- native: MachineChoice
+ native: Required[MachineChoice]
optional_modules: T.List[str]
private_headers: bool
required: bool
@@ -312,7 +312,7 @@ class InternalDependency(Dependency):
d_module_versions: T.List[T.Union[str, int]], d_import_dirs: T.List['IncludeDirs'],
objects: T.List['ExtractedObjects'],
name: T.Optional[str] = None):
- super().__init__({})
+ super().__init__({'native': MachineChoice.HOST}) # TODO: does the native key actually matter
self.version = version
self.is_found = True
self.include_directories = incdirs
@@ -430,7 +430,7 @@ class ExternalDependency(Dependency):
self.static = static
self.libtype = LibType.STATIC if self.static else LibType.PREFER_SHARED
# Is this dependency to be run on the build platform?
- self.for_machine = kwargs.get('native', MachineChoice.HOST)
+ self.for_machine = kwargs['native']
self.clib_compiler = detect_compiler(self.name, environment, self.for_machine, self.language)
def get_compiler(self) -> T.Union['MissingCompiler', 'Compiler']:
@@ -506,7 +506,7 @@ class NotFoundDependency(Dependency):
type_name = DependencyTypeName('not-found')
def __init__(self, name: str, environment: 'Environment') -> None:
- super().__init__({})
+ super().__init__({'native': MachineChoice.HOST}) # TODO: does this actually matter?
self.env = environment
self.name = name
self.is_found = False
@@ -524,8 +524,8 @@ class ExternalLibrary(ExternalDependency):
type_name = DependencyTypeName('library')
def __init__(self, name: str, link_args: T.List[str], environment: 'Environment',
- language: str, silent: bool = False) -> None:
- super().__init__(name, environment, {'language': language})
+ language: str, for_machine: MachineChoice, silent: bool = False) -> None:
+ super().__init__(name, environment, {'language': language, 'native': for_machine})
self.is_found = False
if link_args:
self.is_found = True
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index 171c49455..02c449cb2 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -677,7 +677,7 @@ class BoostDependency(SystemDependency):
# Try getting the BOOST_ROOT from a boost.pc if it exists. This primarily
# allows BoostDependency to find boost from Conan. See #5438
try:
- boost_pc = PkgConfigDependency('boost', self.env, {'required': False})
+ boost_pc = PkgConfigDependency('boost', self.env, {'required': False, 'native': self.for_machine})
if boost_pc.found():
boost_lib_dir = boost_pc.get_variable(pkgconfig='libdir')
boost_inc_dir = boost_pc.get_variable(pkgconfig='includedir')
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py
index e8881cda2..07855ef4a 100644
--- a/mesonbuild/dependencies/cmake.py
+++ b/mesonbuild/dependencies/cmake.py
@@ -4,7 +4,7 @@
from __future__ import annotations
from .base import ExternalDependency, DependencyException, DependencyTypeName
-from ..mesonlib import is_windows, MesonException, PerMachine, MachineChoice
+from ..mesonlib import is_windows, MesonException, PerMachine
from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException, CMakeToolchain, CMakeExecScope, check_cmake_args, resolve_cmake_trace_targets, cmake_is_debug
from .. import mlog
import importlib.resources
@@ -77,7 +77,7 @@ class CMakeDependency(ExternalDependency):
self.language_list: T.List[str] = []
language = kwargs.get('language')
if language is None or force_use_global_compilers:
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
compilers = environment.coredata.compilers[for_machine]
candidates = ['c', 'cpp', 'fortran', 'objc', 'objcxx']
self.language_list += [x for x in candidates if x in compilers]
diff --git a/mesonbuild/dependencies/coarrays.py b/mesonbuild/dependencies/coarrays.py
index d75eb5857..e261f2209 100644
--- a/mesonbuild/dependencies/coarrays.py
+++ b/mesonbuild/dependencies/coarrays.py
@@ -6,7 +6,6 @@ from __future__ import annotations
import functools
import typing as T
-from ..mesonlib import MachineChoice
from .base import DependencyMethods, detect_compiler, SystemDependency
from .cmake import CMakeDependency
from .detect import packages
@@ -24,7 +23,7 @@ def coarray_factory(env: 'Environment',
kwargs: DependencyObjectKWs,
methods: T.List[DependencyMethods]) -> T.List['DependencyGenerator']:
kwargs['language'] = 'fortran'
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
fcid = detect_compiler('coarray', env, for_machine, 'fortran').get_id()
candidates: T.List['DependencyGenerator'] = []
diff --git a/mesonbuild/dependencies/cuda.py b/mesonbuild/dependencies/cuda.py
index 75f6cb9e5..b3401ee03 100644
--- a/mesonbuild/dependencies/cuda.py
+++ b/mesonbuild/dependencies/cuda.py
@@ -29,7 +29,7 @@ class CudaDependency(SystemDependency):
targets_dir = 'targets' # Directory containing CUDA targets.
def __init__(self, name: str, environment: 'Environment', kwargs: DependencyObjectKWs) -> None:
- for_machine = kwargs.get('native', mesonlib.MachineChoice.HOST)
+ for_machine = kwargs['native']
compilers = environment.coredata.compilers[for_machine]
machine = environment.machines[for_machine]
if not kwargs.get('language'):
diff --git a/mesonbuild/dependencies/detect.py b/mesonbuild/dependencies/detect.py
index 0681913a1..206742d1b 100644
--- a/mesonbuild/dependencies/detect.py
+++ b/mesonbuild/dependencies/detect.py
@@ -9,7 +9,7 @@ import typing as T
from .base import ExternalDependency, DependencyException, DependencyMethods, NotFoundDependency
-from ..mesonlib import listify, MachineChoice, PerMachine
+from ..mesonlib import listify, PerMachine
from .. import mlog
if T.TYPE_CHECKING:
@@ -102,7 +102,7 @@ def find_external_dependency(name: str, env: 'Environment', kwargs: DependencyOb
# display the dependency name with correct casing
display_name = display_name_map.get(lname, lname)
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
type_text = PerMachine('Build-time', 'Run-time')[for_machine] + ' dependency'
# build a list of dependency methods to try
@@ -213,8 +213,7 @@ def _build_external_dependency_list(name: str, env: 'Environment', kwargs: Depen
# On OSX only, try framework dependency detector.
if DependencyMethods.EXTRAFRAMEWORK in methods:
- for_machine = kwargs.get('native', MachineChoice.HOST)
- if env.machines[for_machine].is_darwin():
+ if env.machines[kwargs['native']].is_darwin():
from .framework import ExtraFrameworkDependency
candidates.append(functools.partial(ExtraFrameworkDependency, name, env, kwargs))
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index dd21b910f..6e24251cd 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -198,7 +198,7 @@ class LLVMDependencyConfigTool(ConfigToolDependency):
# of bits in the isa that llvm targets, for example, on x86_64
# and aarch64 the name will be llvm-config-64, on x86 and arm
# it will be llvm-config-32.
- if environment.machines[kwargs.get('native', mesonlib.MachineChoice.HOST)].is_64_bit:
+ if environment.machines[kwargs['native']].is_64_bit:
self.tools.append('llvm-config-64')
else:
self.tools.append('llvm-config-32')
@@ -391,7 +391,7 @@ class LLVMDependencyCMake(CMakeDependency):
self.llvm_modules = kwargs.get('modules', [])
self.llvm_opt_modules = kwargs.get('optional_modules', [])
- for_machine = kwargs.get('native', mesonlib.MachineChoice.HOST)
+ for_machine = kwargs['native']
compilers = env.coredata.compilers[for_machine]
if not compilers or not {'c', 'cpp'}.issubset(compilers):
# Initialize basic variables
diff --git a/mesonbuild/dependencies/dub.py b/mesonbuild/dependencies/dub.py
index cfd04ee00..7b4daf37c 100644
--- a/mesonbuild/dependencies/dub.py
+++ b/mesonbuild/dependencies/dub.py
@@ -306,7 +306,7 @@ class DubDependency(ExternalDependency):
for lib in bs['libs']:
if os.name != 'nt':
# trying to add system libraries by pkg-config
- pkgdep = PkgConfigDependency(lib, environment, {'required': True, 'silent': True})
+ pkgdep = PkgConfigDependency(lib, environment, {'required': True, 'silent': True, 'native': self.for_machine})
if pkgdep.is_found:
for arg in pkgdep.get_compile_args():
self.compile_args.append(arg)
diff --git a/mesonbuild/dependencies/factory.py b/mesonbuild/dependencies/factory.py
index 2afe28847..e89adcbb5 100644
--- a/mesonbuild/dependencies/factory.py
+++ b/mesonbuild/dependencies/factory.py
@@ -80,7 +80,7 @@ class DependencyFactory:
if DependencyMethods.CONFIG_TOOL in methods and not configtool_class:
raise DependencyException('A configtool must have a custom class')
- self.extra_kwargs = extra_kwargs or {}
+ self.extra_kwargs = extra_kwargs
self.methods = methods
self.classes: T.Dict[
DependencyMethods,
@@ -116,11 +116,13 @@ class DependencyFactory:
def __call__(self, env: 'Environment', kwargs: DependencyObjectKWs) -> T.List['DependencyGenerator']:
"""Return a list of Dependencies with the arguments already attached."""
methods = process_method_kw(self.methods, kwargs)
- nwargs = self.extra_kwargs.copy()
- nwargs.update(kwargs)
-
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ if self.extra_kwargs:
+ nwargs = self.extra_kwargs.copy()
+ nwargs.update(kwargs)
+ else:
+ nwargs = kwargs.copy()
+ for_machine = kwargs['native']
return [functools.partial(self.classes[m], env, nwargs) for m in methods
if self._process_method(m, env, for_machine)]
diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py
index 75331f254..4effc6ce8 100644
--- a/mesonbuild/dependencies/hdf5.py
+++ b/mesonbuild/dependencies/hdf5.py
@@ -9,7 +9,7 @@ import os
import re
from pathlib import Path
-from ..mesonlib import OrderedSet, join_args, MachineChoice
+from ..mesonlib import OrderedSet, join_args
from .base import DependencyException, DependencyMethods
from .configtool import ConfigToolDependency
from .detect import packages
@@ -98,15 +98,14 @@ class HDF5ConfigToolDependency(ConfigToolDependency):
else:
raise DependencyException('How did you get here?')
- # We need this before we call super()
- for_machine = kwargs.get('native', MachineChoice.HOST)
-
nkwargs = kwargs.copy()
nkwargs['tools'] = tools
# Override the compiler that the config tools are going to use by
# setting the environment variables that they use for the compiler and
# linkers.
+
+ for_machine = kwargs['native']
compiler = environment.coredata.compilers[for_machine][language]
try:
os.environ[f'HDF5_{cenv}'] = join_args(compiler.get_exelist())
@@ -146,7 +145,7 @@ class HDF5ConfigToolDependency(ConfigToolDependency):
def hdf5_factory(env: 'Environment', kwargs: DependencyObjectKWs,
methods: T.List[DependencyMethods]) -> T.List['DependencyGenerator']:
candidates: T.List['DependencyGenerator'] = []
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
if DependencyMethods.PKGCONFIG in methods:
# Use an ordered set so that these remain the first tried pkg-config files
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index b5c3f54de..586930d34 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -531,7 +531,7 @@ def curses_factory(env: 'Environment',
kwargs: DependencyObjectKWs,
methods: T.List[DependencyMethods]) -> T.List['DependencyGenerator']:
candidates: T.List['DependencyGenerator'] = []
- for_machine = kwargs.get('native', mesonlib.MachineChoice.HOST)
+ for_machine = kwargs['native']
if DependencyMethods.PKGCONFIG in methods:
pkgconfig_files = ['pdcurses', 'ncursesw', 'ncurses', 'curses']
diff --git a/mesonbuild/dependencies/mpi.py b/mesonbuild/dependencies/mpi.py
index 60e4c5828..78d793dbc 100644
--- a/mesonbuild/dependencies/mpi.py
+++ b/mesonbuild/dependencies/mpi.py
@@ -8,7 +8,6 @@ import typing as T
import os
import re
-from ..mesonlib import MachineChoice
from ..envconfig import detect_cpu_family
from ..mesonlib import Popen_safe
from .base import DependencyException, DependencyMethods, detect_compiler, SystemDependency
@@ -32,7 +31,7 @@ def mpi_factory(env: 'Environment',
# OpenMPI doesn't work without any other languages
return []
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
candidates: T.List['DependencyGenerator'] = []
compiler = detect_compiler('mpi', env, for_machine, language)
diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
index ad9262981..146f41d4d 100644
--- a/mesonbuild/dependencies/python.py
+++ b/mesonbuild/dependencies/python.py
@@ -478,7 +478,7 @@ class PythonPkgConfigDependency(PkgConfigDependency, _PythonDependencyBase):
self.is_found = False
return
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
sysroot = environment.properties[for_machine].get_sys_root() or ''
pkg_libdir = sysroot + pkg_libdir
diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py
index de71a2056..e79a20fed 100644
--- a/mesonbuild/interpreter/compiler.py
+++ b/mesonbuild/interpreter/compiler.py
@@ -658,6 +658,7 @@ class CompilerHolder(ObjectHolder['Compiler']):
lib = dependencies.ExternalLibrary(libname, None,
self.environment,
self.compiler.language,
+ self.held_object.for_machine,
silent=True)
return lib
@@ -717,7 +718,7 @@ class CompilerHolder(ObjectHolder['Compiler']):
.format(self.compiler.get_display_language(),
libtype_s, libname))
lib = dependencies.ExternalLibrary(libname, linkargs, self.environment,
- self.compiler.language)
+ self.compiler.language, self.held_object.for_machine)
return lib
def _has_argument_impl(self, arguments: T.Union[str, T.List[str]],
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py
index baf5ea39e..4e4dcde56 100644
--- a/mesonbuild/interpreter/dependencyfallbacks.py
+++ b/mesonbuild/interpreter/dependencyfallbacks.py
@@ -8,7 +8,7 @@ from .. import mlog
from .. import dependencies
from .. import build
from ..wrap import WrapMode
-from ..mesonlib import stringlistify, version_compare_many, MachineChoice
+from ..mesonlib import stringlistify, version_compare_many
from ..options import OptionKey
from ..dependencies import Dependency, DependencyException, NotFoundDependency
from ..interpreterbase import (MesonInterpreterObject, FeatureNew,
@@ -96,7 +96,7 @@ class DependencyFallbacksHolder(MesonInterpreterObject):
self._handle_featurenew_dependencies(name)
dep = dependencies.find_external_dependency(name, self.environment, kwargs)
if dep.found():
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
identifier = dependencies.get_dep_identifier(name, kwargs)
self.coredata.deps[for_machine].put(identifier, dep)
return dep
@@ -209,7 +209,7 @@ class DependencyFallbacksHolder(MesonInterpreterObject):
# of None in the case the dependency is cached as not-found, or if cached
# version does not match. In that case we don't want to continue with
# other candidates.
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
identifier = dependencies.get_dep_identifier(name, kwargs)
wanted_vers = stringlistify(kwargs.get('version', []))
@@ -366,7 +366,7 @@ class DependencyFallbacksHolder(MesonInterpreterObject):
# Override this dependency to have consistent results in subsequent
# dependency lookups.
for name in self.names:
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
identifier = dependencies.get_dep_identifier(name, kwargs)
if identifier not in self.build.dependency_overrides[for_machine]:
self.build.dependency_overrides[for_machine][identifier] = \
diff --git a/mesonbuild/mdevenv.py b/mesonbuild/mdevenv.py
index e6c4fad4d..46ec14824 100644
--- a/mesonbuild/mdevenv.py
+++ b/mesonbuild/mdevenv.py
@@ -84,7 +84,7 @@ def bash_completion_files(b: build.Build, install_data: 'InstallData') -> T.List
from .dependencies.pkgconfig import PkgConfigDependency
result = []
dep = PkgConfigDependency('bash-completion', b.environment,
- {'required': False, 'silent': True, 'version': ['>=2.10']})
+ {'required': False, 'silent': True, 'version': ['>=2.10'], 'native': MachineChoice.HOST})
if dep.found():
prefix = b.environment.coredata.optstore.get_value_for(OptionKey('prefix'))
assert isinstance(prefix, str), 'for mypy'
diff --git a/mesonbuild/modules/_qt.py b/mesonbuild/modules/_qt.py
index ae6e2d477..832e808bf 100644
--- a/mesonbuild/modules/_qt.py
+++ b/mesonbuild/modules/_qt.py
@@ -15,7 +15,7 @@ from .. import build
from .. import options
from .. import mlog
from ..dependencies import DependencyMethods, find_external_dependency, Dependency, ExternalLibrary, InternalDependency
-from ..mesonlib import MesonException, File, FileMode, version_compare, Popen_safe
+from ..mesonlib import MachineChoice, MesonException, File, FileMode, version_compare, Popen_safe
from ..interpreter import extract_required_kwarg
from ..interpreter.type_checking import DEPENDENCY_METHOD_KW, INSTALL_DIR_KW, INSTALL_KW, NoneType
from ..interpreterbase import ContainerTypeInfo, FeatureDeprecated, KwargInfo, noPosargs, FeatureNew, typed_kwargs, typed_pos_args
@@ -270,7 +270,7 @@ class QtBaseModule(ExtensionModule):
return
self._tools_detected = True
mlog.log(f'Detecting Qt{self.qt_version} tools')
- kwargs: DependencyObjectKWs = {'required': required, 'modules': ['Core'], 'method': method}
+ kwargs: DependencyObjectKWs = {'required': required, 'modules': ['Core'], 'method': method, 'native': MachineChoice.HOST}
# Just pick one to make mypy happy
qt = T.cast('QtPkgConfigDependency', find_external_dependency(f'qt{self.qt_version}', state.environment, kwargs))
if qt.found():
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index 96ba1e0f0..23b2aa788 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -170,7 +170,7 @@ class PythonInstallation(_ExternalProgramHolder['PythonExternalProgram']):
new_deps = mesonlib.extract_as_list(kwargs, 'dependencies')
pydep = next((dep for dep in new_deps if isinstance(dep, _PythonDependencyBase)), None)
if pydep is None:
- pydep = self._dependency_method_impl({})
+ pydep = self._dependency_method_impl({'native': kwargs['native']})
if not pydep.found():
raise mesonlib.MesonException('Python dependency not found')
new_deps.append(pydep)
@@ -259,7 +259,7 @@ class PythonInstallation(_ExternalProgramHolder['PythonExternalProgram']):
return '0x{:02x}{:02x}0000'.format(major, minor)
def _dependency_method_impl(self, kwargs: DependencyObjectKWs) -> Dependency:
- for_machine = kwargs.get('native', MachineChoice.HOST)
+ for_machine = kwargs['native']
identifier = get_dep_identifier(self._full_path(), kwargs)
dep = self.interpreter.coredata.deps[for_machine].get(identifier)
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 1304658da..0959f22a3 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -2156,7 +2156,7 @@ class AllPlatformTests(BasePlatformTests):
# Find foo dependency
os.environ['PKG_CONFIG_LIBDIR'] = self.privatedir
env = get_fake_env(testdir, self.builddir, self.prefix)
- kwargs = {'required': True, 'silent': True}
+ kwargs = {'required': True, 'silent': True, 'native': MachineChoice.HOST}
foo_dep = PkgConfigDependency('libanswer', env, kwargs)
# Ensure link_args are properly quoted
libdir = PurePath(prefix) / PurePath(libdir)
diff --git a/unittests/internaltests.py b/unittests/internaltests.py
index 4d34a335d..27de7afb1 100644
--- a/unittests/internaltests.py
+++ b/unittests/internaltests.py
@@ -667,7 +667,7 @@ class InternalTests(unittest.TestCase):
with mock.patch.object(PkgConfigInterface, 'instance') as instance_method:
instance_method.return_value = FakeInstance(env, MachineChoice.HOST, silent=True)
- kwargs = {'required': True, 'silent': True}
+ kwargs = {'required': True, 'silent': True, 'native': MachineChoice.HOST}
foo_dep = PkgConfigDependency('foo', env, kwargs)
self.assertEqual(foo_dep.get_link_args(),
[(p1 / 'libfoo.a').as_posix(), (p2 / 'libbar.a').as_posix()])
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index 4f775d651..e879ac3dd 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -149,7 +149,7 @@ class LinuxlikeTests(BasePlatformTests):
testdir = os.path.join(self.common_test_dir, '44 pkgconfig-gen')
self.init(testdir)
env = get_fake_env(testdir, self.builddir, self.prefix)
- kwargs = {'required': True, 'silent': True}
+ kwargs = {'required': True, 'silent': True, 'native': MachineChoice.HOST}
os.environ['PKG_CONFIG_LIBDIR'] = self.privatedir
foo_dep = PkgConfigDependency('libfoo', env, kwargs)
self.assertTrue(foo_dep.found())
@@ -1145,7 +1145,7 @@ class LinuxlikeTests(BasePlatformTests):
env = get_fake_env(testdir, self.builddir, self.prefix)
env.coredata.optstore.set_option(OptionKey('pkg_config_path'), pkg_dir)
- kwargs = {'required': True, 'silent': True}
+ kwargs = {'required': True, 'silent': True, 'native': MachineChoice.HOST}
relative_path_dep = PkgConfigDependency('librelativepath', env, kwargs)
self.assertTrue(relative_path_dep.found())
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-03 10:31:58 +0000