diff options
Diffstat (limited to 'mesonbuild/coredata.py')
| -rw-r--r-- | mesonbuild/coredata.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index d70c23038..4e2f3e008 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -299,6 +299,7 @@ class CoreData: # Only to print a warning if it changes between Meson invocations. self.pkgconf_envvar = os.environ.get('PKG_CONFIG_PATH', '') self.config_files = self.__load_config_files(options.native_file) + self.libdir_cross_fixup() @staticmethod def __load_config_files(filenames): @@ -348,6 +349,13 @@ class CoreData: raise MesonException('Cannot find specified cross file: ' + filename) + def libdir_cross_fixup(self): + # By default set libdir to "lib" when cross compiling since + # getting the "system default" is always wrong on multiarch + # platforms as it gets a value like lib/x86_64-linux-gnu. + if self.cross_file is not None: + self.builtins['libdir'].value = 'lib' + def sanitize_prefix(self, prefix): if not os.path.isabs(prefix): raise MesonException('prefix value {!r} must be an absolute path' |