aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-12-07 14:08:37 -0800
committerJussi Pakkanen <jpakkane@gmail.com>2021-12-11 21:31:59 +0200
commit05d61b4c66ae87185087db114cde964823e9b603 (patch)
tree2ca7d3ca81b36664d3a4e753ad4a49cbf56af70a /mesonbuild/backend
parentbad383f6b3e8aba53e379caa122623e438d5a49d (diff)
downloadmeson-05d61b4c66ae87185087db114cde964823e9b603.zip
meson-05d61b4c66ae87185087db114cde964823e9b603.tar.gz
meson-05d61b4c66ae87185087db114cde964823e9b603.tar.bz2
install: Don't run ldconfig on cross builds
Even if we install without a DESTDIR set, we should never update ldconfig when cross compiling. Fixes #9707
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r--mesonbuild/backend/backends.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 718f54c..4b368e7 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -109,7 +109,8 @@ class CleanTrees:
class InstallData:
def __init__(self, source_dir: str, build_dir: str, prefix: str, libdir: str,
strip_bin: T.List[str], install_umask: T.Union[str, int],
- mesonintrospect: T.List[str], version: str):
+ mesonintrospect: T.List[str], version: str,
+ is_cross_build: bool):
# TODO: in python 3.8 or with typing_Extensions install_umask could be:
# `T.Union[T.Literal['preserve'], int]`, which would be more accurate.
self.source_dir = source_dir
@@ -128,6 +129,7 @@ class InstallData:
self.install_subdirs: T.List[SubdirInstallData] = []
self.mesonintrospect = mesonintrospect
self.version = version
+ self.is_cross_build = is_cross_build
class TargetInstallData:
@@ -1510,7 +1512,8 @@ class Backend:
strip_bin,
umask,
self.environment.get_build_command() + ['introspect'],
- self.environment.coredata.version)
+ self.environment.coredata.version,
+ self.environment.is_cross_build())
self.generate_depmf_install(d)
self.generate_target_install(d)
self.generate_header_install(d)