[vlc-commits] [Git][videolan/vlc][master] contrib: remove Android sysroot CMake hacks

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
658c3662 by Steve Lhomme at 2024-11-07T14:59:32+00:00
contrib: remove Android sysroot CMake hacks

When 750aedbdb8756168b04398f04ad91f85546dc293 was introduced
A --sysroot was used since  a8fe060f3f5e17af2aa7b7bafb599b80e4a3181f.
This is no longer the case.

- - - - -


2 changed files:

- contrib/src/gen-cmake-toolchain.py
- contrib/src/main.mak


Changes:

=====================================
contrib/src/gen-cmake-toolchain.py
=====================================
@@ -44,9 +44,6 @@ _add_environ_val('CMAKE_OSX_SYSROOT', 'OSX_SYSROOT')
 _add_environ_val('CMAKE_C_COMPILER', 'CC')
 _add_environ_val('CMAKE_CXX_COMPILER', 'CXX')
 
-_add_environ_val('CMAKE_C_SYSROOT_FLAG', 'C_SYSROOT_FLAG')
-_add_environ_val('CMAKE_CXX_SYSROOT_FLAG', 'CXX_SYSROOT_FLAG')
-
 _add_environ_val('CMAKE_ANDROID_NDK', 'ANDROID_NDK')
 _add_environ_val('CMAKE_ANDROID_ARCH_ABI', 'ANDROID_ABI')
 _add_environ_val('CMAKE_ANDROID_API', 'ANDROID_API')


=====================================
contrib/src/main.mak
=====================================
@@ -765,10 +765,6 @@ ifdef HAVE_ANDROID
 	CMAKE_TOOLCHAIN_ENV += ANDROID_NDK=$(ANDROID_NDK)
 	CMAKE_TOOLCHAIN_ENV += ANDROID_ABI=$(ANDROID_ABI)
 	CMAKE_TOOLCHAIN_ENV += ANDROID_API=$(ANDROID_API)
-# cmake will overwrite our --sysroot with a native (host) one on Darwin
-# Set it to "" right away to short-circuit this behaviour
-	CMAKE_TOOLCHAIN_ENV += CXX_SYSROOT_FLAG=
-	CMAKE_TOOLCHAIN_ENV += C_SYSROOT_FLAG=
 endif
 ifdef MSYS_BUILD
 	CMAKE_TOOLCHAIN_ENV += FIND_ROOT_PATH="$(shell cygpath -m $(PREFIX))"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/658c366248c7189fc61cd84e3c7430d466b7bff5

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/658c366248c7189fc61cd84e3c7430d466b7bff5
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance