vlc | branch: master | Rafaël Carré <[email protected]> | Wed Jan 29 18:15:42 2014 +0100| [750aedbdb8756168b04398f04ad91f85546dc293] | committer: Rafaël Carré
contrib: avoid cmake rewriting gcc sysroot on Darwin > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=750aedbdb8756168b04398f04ad91f85546dc293 --- contrib/src/main.mak | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index a22b717..8b2a9a5 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -410,6 +410,12 @@ endif endif ifdef HAVE_CROSS_COMPILE echo "set(_CMAKE_TOOLCHAIN_PREFIX $(HOST)-)" >> $@ +ifdef HAVE_ANDROID +# cmake will overwrite our --sysroot with a native (host) one on Darwin +# Set it to "" right away to short-circuit this behaviour + echo "set(CMAKE_CXX_SYSROOT_FLAG \"\")" >> $@ + echo "set(CMAKE_C_SYSROOT_FLAG \"\")" >> $@ +endif endif echo "set(CMAKE_C_COMPILER $(CC))" >> $@ echo "set(CMAKE_CXX_COMPILER $(CXX))" >> $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
