diff options
| author | L. E. Segovia <amy@centricular.com> | 2024-02-13 18:13:37 -0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2024-02-14 05:39:18 +0000 |
| commit | 1b1867ff74b9ffafd525ede2e5ae8374e4e4a231 (patch) | |
| tree | 581ab97ea64c86166f572e97f5545a6d5e2d3f25 /recipes | |
| parent | 73345c9c9a96571d42e397ef3e0cdcb87ab32c54 (diff) | |
cerbero, config/android, openssl: Don't pass the Android toolchain path wholesale
In !1191 (commit 643087f3f09fd637b29335efb608ac7a82031ecf), the removal of GCC
support relied on making the Android compiler available to all processes. This
fixed accessing the host's compiler for Meson based builds like fribidi's, and
also allowed OpenSSL to build, but there was a hidden side effect: it broke
Rust's ability to compile build scripts because the linker it finds (LLVM 14
from the NDK) no longer supports `--no-add-needed` [1] [2].
A more Meson-ese fix is to pass the toolchain as a constant in the native file,
and fill the path in manually. This also needs to be injected manually into the
`PATH` for OpenSSL as that's how its configure script consumes the toolchain.
[1]: https://github.com/llvm/llvm-project/issues/54756
[2]: https://github.com/llvm/llvm-project/commit/815a1207bfe121c8dcf3804a4f4638e580f63519
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1368>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/openssl.recipe | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes/openssl.recipe b/recipes/openssl.recipe index 77c50d56..dfc9572a 100644 --- a/recipes/openssl.recipe +++ b/recipes/openssl.recipe @@ -181,6 +181,8 @@ class Recipe(recipe.Recipe): if self.config.target_platform == Platform.IOS: self.library_type = LibraryType.STATIC + if self.config.target_platform == Platform.ANDROID: + self.prepend_env('PATH', self.get_env('ANDROID_NDK_TOOLCHAIN_BIN'), sep=os.pathsep) @modify_environment |