vlc/vlc-3.0 | branch: master | Alexandre Janniaux 
<[email protected]> | Sun Jan 20 18:30:03 2019 +0100| 
[a8e9d1a654b71b0d1952356318d8c1d9612c477f] | committer: Hugo Beauzée-Luyssen

meson: add support for cross-compilation to linux

Define host system to linux when needed as it is not directly infered by
meson and generates a python error. It is used for example to
cross-compile to non-android ARM linux.

Signed-off-by: Hugo Beauzée-Luyssen <[email protected]>
(cherry picked from commit 10e87f0a45a745e5424d111885b16bb1a130380d)
Signed-off-by: Hugo Beauzée-Luyssen <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a8e9d1a654b71b0d1952356318d8c1d9612c477f
---

 contrib/src/main.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 6b70974651..e3e7daaf0a 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -546,7 +546,8 @@ else
 ifdef HAVE_IOS
        echo "system = 'darwin'" >> $@
 else
-ifdef HAVE_ANDROID
+ifdef HAVE_LINUX
+       # android has also system = linux and defines HAVE_LINUX
        echo "system = 'linux'" >> $@
 endif
 endif

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to