vlc | branch: master | Alexandre Janniaux <[email protected]> | Sun 
Jan 20 18:30:03 2019 +0100| [10e87f0a45a745e5424d111885b16bb1a130380d] | 
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]>

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

 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 4b3aee45fb..5f277d25e7 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -564,7 +564,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