diff options
| author | Loïc Le Page <llepage@fluendo.com> | 2019-12-16 19:28:52 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2020-02-04 12:11:30 +0000 |
| commit | 2de83d1ea1c9e526ddcd6bb5ef6973ee3b1fc948 (patch) | |
| tree | c1308c6b85aff744cac689563cdefcbe4fe77fbc | |
| parent | 2c804b63aceb5fa13fe4f32291e737b298e4d025 (diff) | |
Prepend $CERBERO_PREFIX/lib path in LD_LIBRARY_PATH
When not cross-compiling, $CERBERO_PREFIX/lib path was added at the end
of LD_LIBRARY_PATH whereas build-tools/lib path was prepended. As a
consequence, libraries and tools installed during bootstrap were taking
precedence over the one built later within the prefix (for libraries and
tools available at both places). This happens for example with glib when
it is installed during bootstrap (glib-tools.recipe) and built later as
a dependency (glib.recipe). This commit prepends $CERBERO_PREFIX/lib in
LD_LIBRARY_PATH in order to use the build-tools/lib when no dependency
is custom built, and then to use the $CERBERO_PREFIX/lib once the
dependency has been correctly built. It also brings coherency with PATH
variable order as $CERBERO_PREFIX/bin preceeds build-tools/bin.
| -rw-r--r-- | cerbero/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cerbero/config.py b/cerbero/config.py index 927c7c16..2fa1db8d 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -322,7 +322,7 @@ class Config (object): ld_library_path = self._join_path( os.path.join(self.build_tools_prefix, 'lib'), path) if not self.cross_compiling(): - ld_library_path = self._join_path(ld_library_path, libdir) + ld_library_path = self._join_path(libdir, ld_library_path) if self.extra_lib_path is not None: ld_library_path = self._join_path(ld_library_path, self.extra_lib_path) if self.toolchain_prefix is not None: |