Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
912b4702 by Steve Lhomme at 2024-11-05T13:04:57+00:00
contrib: keep our PKG_CONFIG in the CMake toolchain file
It's part of HOSTOOLS we keep passing to the CMake configuration.
- - - - -
ddb544ca by Steve Lhomme at 2024-11-05T13:04:57+00:00
contrib: keep our linker in the CMake toolchain file
It's part of HOSTOOLS we keep passing to the CMake configuration.
- - - - -
280d53f3 by Steve Lhomme at 2024-11-05T13:04:57+00:00
contrib: don't pass HOSTTOOLS during CMake configuration
The tools should already be in the toolchain.cmake file.
- - - - -
477f37bd by Steve Lhomme at 2024-11-05T13:04:57+00:00
contrib: don't set the _CMAKE_TOOLCHAIN_PREFIX in toolchain.cmake
It's not meant to be used publicly.
- - - - -
2 changed files:
- contrib/src/gen-cmake-toolchain.py
- contrib/src/main.mak
Changes:
=====================================
contrib/src/gen-cmake-toolchain.py
=====================================
@@ -37,12 +37,10 @@ _add_environ_val('CMAKE_CXX_COMPILER_RANLIB', 'RANLIB')
_add_environ_val('CMAKE_AR', 'AR')
_add_environ_val('CMAKE_C_COMPILER_AR', 'AR')
_add_environ_val('CMAKE_CXX_COMPILER_AR', 'AR')
+_add_environ_val('CMAKE_LINKER', 'LD')
_add_environ_val('CMAKE_OSX_SYSROOT', 'OSX_SYSROOT')
-# we should not have to set this
-_add_environ_val('_CMAKE_TOOLCHAIN_PREFIX', 'TOOLCHAIN_PREFIX')
-
_add_environ_val('CMAKE_C_COMPILER', 'CC')
_add_environ_val('CMAKE_CXX_COMPILER', 'CXX')
@@ -53,6 +51,8 @@ _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')
+_add_environ_val('PKG_CONFIG_EXECUTABLE', 'PKG_CONFIG')
+
_add_environ_val('CMAKE_FIND_ROOT_PATH', 'PREFIX')
_add_environ_val('CMAKE_FIND_ROOT_PATH', 'FIND_ROOT_PATH')
=====================================
contrib/src/main.mak
=====================================
@@ -354,7 +354,7 @@ endif
# Add these flags after CMake consumed the CFLAGS/CXXFLAGS
# CMake handles the optimization level with CMAKE_BUILD_TYPE
-HOSTVARS_CMAKE := $(HOSTTOOLS) \
+HOSTVARS_CMAKE := \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/70c1f979a8ec96ed1bb449da73d8b8b56aaca991...477f37bdbab7fec32e684cb15ee47c4a7784110b
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/70c1f979a8ec96ed1bb449da73d8b8b56aaca991...477f37bdbab7fec32e684cb15ee47c4a7784110b
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
