]> git.sesse.net Git - vlc/commitdiff
contrib: avoid cmake rewriting gcc sysroot on Darwin
authorRafaël Carré <funman@videolan.org>
Wed, 29 Jan 2014 17:15:42 +0000 (18:15 +0100)
committerRafaël Carré <funman@videolan.org>
Wed, 29 Jan 2014 17:15:42 +0000 (18:15 +0100)
contrib/src/main.mak

index a22b7179def012e922b79a163b60ba446de8aee6..8b2a9a58442f354d433cd6eddb460c316dc44c5b 100644 (file)
@@ -410,6 +410,12 @@ endif
 endif
 ifdef HAVE_CROSS_COMPILE
        echo "set(_CMAKE_TOOLCHAIN_PREFIX $(HOST)-)" >> $@
 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))" >> $@
 endif
        echo "set(CMAKE_C_COMPILER $(CC))" >> $@
        echo "set(CMAKE_CXX_COMPILER $(CXX))" >> $@