aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mesonbuild/compilers/__init__.py2
-rw-r--r--mesonbuild/compilers/compilers.py6
-rw-r--r--mesonbuild/dependencies/base.py30
-rw-r--r--mesonbuild/dependencies/boost.py12
-rw-r--r--mesonbuild/dependencies/dev.py6
-rw-r--r--mesonbuild/dependencies/misc.py4
-rw-r--r--mesonbuild/dependencies/platform.py2
-rw-r--r--mesonbuild/dependencies/ui.py12
-rw-r--r--mesonbuild/modules/python.py2
9 files changed, 42 insertions, 34 deletions
diff --git a/mesonbuild/compilers/__init__.py b/mesonbuild/compilers/__init__.py
index 122f969..8c5a7f7 100644
--- a/mesonbuild/compilers/__init__.py
+++ b/mesonbuild/compilers/__init__.py
@@ -27,6 +27,7 @@ __all__ = [
'all_languages',
'base_options',
+ 'clib_langs',
'clike_langs',
'c_suffixes',
'cpp_suffixes',
@@ -103,6 +104,7 @@ from .compilers import (
ICC_STANDARD,
all_languages,
base_options,
+ clib_langs,
clike_langs,
c_suffixes,
cpp_suffixes,
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 64d6d1c..2c48d07 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -48,9 +48,13 @@ lang_suffixes = {
all_languages = lang_suffixes.keys()
cpp_suffixes = lang_suffixes['cpp'] + ('h',)
c_suffixes = lang_suffixes['c'] + ('h',)
+# List of languages that by default consume and output libraries following the
+# C ABI; these can generally be used interchangebly
+clib_langs = ('objcpp', 'cpp', 'objc', 'c', 'fortran',)
# List of languages that can be linked with C code directly by the linker
# used in build.py:process_compilers() and build.py:get_dynamic_linker()
-clike_langs = ('d', 'objcpp', 'cpp', 'objc', 'c', 'fortran', )
+# XXX: Add Rust to this?
+clike_langs = ('d',) + clib_langs
clike_suffixes = ()
for _l in clike_langs + ('vala',):
clike_suffixes += lang_suffixes[_l]
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index eb8ce0d..a5356a8 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -27,6 +27,7 @@ from pathlib import PurePath
from .. import mlog
from .. import mesonlib
+from ..compilers import clib_langs, clike_langs
from ..mesonlib import MesonException, OrderedSet
from ..mesonlib import Popen_safe, version_compare_many, version_compare, listify
@@ -219,6 +220,7 @@ class ExternalDependency(Dependency):
self.want_cross = not kwargs['native']
else:
self.want_cross = self.env.is_cross_build()
+ self.clib_compiler = None
# Set the compiler that will be used by this dependency
# This is only used for configuration checks
if self.want_cross:
@@ -229,19 +231,20 @@ class ExternalDependency(Dependency):
# else try to pick something that looks usable.
if self.language:
if self.language not in compilers:
- m = self.name.capitalize() + ' requires a {} compiler'
+ m = self.name.capitalize() + ' requires a {0} compiler, but ' \
+ '{0} is not in the list of project languages'
raise DependencyException(m.format(self.language.capitalize()))
- self.compiler = compilers[self.language]
+ self.clib_compiler = compilers[self.language]
else:
- # Try to find a compiler that this dependency can use for compiler
- # checks. It's ok if we don't find one.
- for lang in ('c', 'cpp', 'objc', 'objcpp', 'fortran', 'd'):
- self.compiler = compilers.get(lang, None)
- if self.compiler:
+ # Try to find a compiler that can find C libraries for
+ # running compiler.find_library()
+ for lang in clib_langs:
+ self.clib_compiler = compilers.get(lang, None)
+ if self.clib_compiler:
break
def get_compiler(self):
- return self.compiler
+ return self.clib_compiler
def get_partial_dependency(self, *, compile_args=False, link_args=False,
links=False, includes=False, sources=False):
@@ -603,12 +606,11 @@ class PkgConfigDependency(ExternalDependency):
libpaths.add(lib[2:])
continue
elif lib.startswith('-l'):
- if self.compiler:
- args = self.compiler.find_library(lib[2:], self.env,
- list(libpaths), libtype)
- # If no compiler is set on the dependency, the project only
- # uses a non-clike language such as Rust, C#, Python, etc. In
- # this case, all we can do is limp along.
+ if self.clib_compiler:
+ args = self.clib_compiler.find_library(lib[2:], self.env,
+ list(libpaths), libtype)
+ # If the project only uses a non-clib language such as D, Rust,
+ # C#, Python, etc, all we can do is limp along.
else:
args = None
if args:
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index 62274b5..0ff49b1 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -185,7 +185,7 @@ class BoostDependency(ExternalDependency):
def detect_nix_roots(self):
return [os.path.abspath(os.path.join(x, '..'))
- for x in self.compiler.get_default_include_dirs()]
+ for x in self.clib_compiler.get_default_include_dirs()]
def detect_win_roots(self):
res = []
@@ -243,8 +243,8 @@ class BoostDependency(ExternalDependency):
# and http://stackoverflow.com/questions/37218953/isystem-on-a-system-include-directory-causes-errors
# for more details
- if include_dir and include_dir not in self.compiler.get_default_include_dirs():
- args.append("".join(self.compiler.get_include_args(include_dir, True)))
+ if include_dir and include_dir not in self.clib_compiler.get_default_include_dirs():
+ args.append("".join(self.clib_compiler.get_include_args(include_dir, True)))
return args
def get_requested(self, kwargs):
@@ -256,7 +256,7 @@ class BoostDependency(ExternalDependency):
def detect_headers_and_version(self):
try:
- version = self.compiler.get_define('BOOST_LIB_VERSION', '#include <boost/version.hpp>', self.env, self.get_compile_args(), [])
+ version = self.clib_compiler.get_define('BOOST_LIB_VERSION', '#include <boost/version.hpp>', self.env, self.get_compile_args(), [])
except mesonlib.EnvironmentException:
return
except TypeError:
@@ -361,7 +361,7 @@ class BoostDependency(ExternalDependency):
for module in self.requested_modules:
libname = 'boost_' + module + tag
- args = self.compiler.find_library(libname, self.env, self.extra_lib_dirs())
+ args = self.clib_compiler.find_library(libname, self.env, self.extra_lib_dirs())
if args is None:
mlog.debug("Couldn\'t find library '{}' for boost module '{}' (ABI tag = '{}')".format(libname, module, tag))
all_found = False
@@ -476,7 +476,7 @@ class BoostDependency(ExternalDependency):
def get_link_args(self):
args = []
for dir in self.extra_lib_dirs():
- args += self.compiler.get_linker_search_args(dir)
+ args += self.clib_compiler.get_linker_search_args(dir)
for lib in self.requested_modules:
args += self.lib_modules['boost_' + lib]
return args
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index ffd9666..cdee8ed 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -36,8 +36,8 @@ class GTestDependency(ExternalDependency):
def detect(self):
self.version = '1.something_maybe'
- gtest_detect = self.compiler.find_library("gtest", self.env, [])
- gtest_main_detect = self.compiler.find_library("gtest_main", self.env, [])
+ gtest_detect = self.clib_compiler.find_library("gtest", self.env, [])
+ gtest_main_detect = self.clib_compiler.find_library("gtest_main", self.env, [])
if gtest_detect and (not self.main or gtest_main_detect):
self.is_found = True
self.compile_args = []
@@ -83,7 +83,7 @@ class GMockDependency(ExternalDependency):
self.version = '1.something_maybe'
# GMock may be a library or just source.
# Work with both.
- gmock_detect = self.compiler.find_library("gmock", self.env, [])
+ gmock_detect = self.clib_compiler.find_library("gmock", self.env, [])
if gmock_detect:
self.is_found = True
self.compile_args = []
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 37195cc..9d8691c 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -258,7 +258,7 @@ class OpenMPDependency(ExternalDependency):
super().__init__('openmp', environment, language, kwargs)
self.is_found = False
try:
- openmp_date = self.compiler.get_define('_OPENMP', '', self.env, [], [self])
+ openmp_date = self.clib_compiler.get_define('_OPENMP', '', self.env, [], [self])
except mesonlib.EnvironmentException as e:
mlog.debug('OpenMP support not available in the compiler')
mlog.debug(e)
@@ -266,7 +266,7 @@ class OpenMPDependency(ExternalDependency):
if openmp_date:
self.version = self.VERSIONS[openmp_date]
- if self.compiler.has_header('omp.h', '', self.env, dependencies=[self]):
+ if self.clib_compiler.has_header('omp.h', '', self.env, dependencies=[self]):
self.is_found = True
else:
mlog.log(mlog.yellow('WARNING:'), 'OpenMP found but omp.h missing.')
diff --git a/mesonbuild/dependencies/platform.py b/mesonbuild/dependencies/platform.py
index 95ab727..5f89ccb 100644
--- a/mesonbuild/dependencies/platform.py
+++ b/mesonbuild/dependencies/platform.py
@@ -29,7 +29,7 @@ class AppleFrameworks(ExternalDependency):
if not modules:
raise DependencyException("AppleFrameworks dependency requires at least one module.")
self.frameworks = modules
- # FIXME: Use self.compiler to check if the frameworks are available
+ # FIXME: Use self.clib_compiler to check if the frameworks are available
for f in self.frameworks:
self.link_args += ['-framework', f]
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index 44fdcd5..72958dd 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -43,14 +43,14 @@ class GLDependency(ExternalDependency):
self.is_found = True
# FIXME: Use AppleFrameworks dependency
self.link_args = ['-framework', 'OpenGL']
- # FIXME: Detect version using self.compiler
+ # FIXME: Detect version using self.clib_compiler
self.version = '1'
return
if mesonlib.is_windows():
self.is_found = True
- # FIXME: Use self.compiler.find_library()
+ # FIXME: Use self.clib_compiler.find_library()
self.link_args = ['-lopengl32']
- # FIXME: Detect version using self.compiler
+ # FIXME: Detect version using self.clib_compiler
self.version = '1'
return
@@ -547,7 +547,7 @@ class VulkanDependency(ExternalDependency):
inc_path = os.path.join(self.vulkan_sdk, inc_dir)
header = os.path.join(inc_path, 'vulkan', 'vulkan.h')
lib_path = os.path.join(self.vulkan_sdk, lib_dir)
- find_lib = self.compiler.find_library(lib_name, environment, lib_path)
+ find_lib = self.clib_compiler.find_library(lib_name, environment, lib_path)
if not find_lib:
raise DependencyException('VULKAN_SDK point to invalid directory (no lib)')
@@ -567,8 +567,8 @@ class VulkanDependency(ExternalDependency):
return
else:
# simply try to guess it, usually works on linux
- libs = self.compiler.find_library('vulkan', environment, [])
- if libs is not None and self.compiler.has_header('vulkan/vulkan.h', '', environment):
+ libs = self.clib_compiler.find_library('vulkan', environment, [])
+ if libs is not None and self.clib_compiler.has_header('vulkan/vulkan.h', '', environment):
self.type_name = 'system'
self.is_found = True
self.version = 1 # TODO
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index b30a1e6..db9d39d 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -125,7 +125,7 @@ class PythonDependency(ExternalDependency):
libname += self.variables['ABIFLAGS']
libdirs = []
- largs = self.compiler.find_library(libname, environment, libdirs)
+ largs = self.clib_compiler.find_library(libname, environment, libdirs)
self.is_found = largs is not None
generated by cgit v1.1 at 2025-05-06 15:42:53 +0000