videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

contrib: don't set the build mode in the toolchain file 

It doesn't describe the toolchain we use. We can pass the value as a regular flag.
This commit is contained in:
Steve Lhomme 2024-04-15 11:11:57 +02:00
parent 58c60d1397
commit 89fe89ee75
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/src/gen-cmake-toolchain.py
View File

@ -28,7 +28,6 @@ def _add_environ_val_not_empty(meson_key, env_key):
args.file.write("# CMake toolchain automatically generated by contrib makefile\n")
# Binaries section
_add_environ_val('CMAKE_BUILD_TYPE', 'BUILD_TYPE')
_add_environ_val('CMAKE_SYSTEM_PROCESSOR', 'HOST_ARCH')
_add_environ_val_not_empty('CMAKE_SYSTEM_NAME', 'SYSTEM_NAME')
_add_environ_val('CMAKE_RC_COMPILER', 'RC_COMPILER')

10
contrib/src/main.mak
View File

@ -473,6 +473,11 @@ CMAKE = $(CMAKECONFIG) \
-DCMAKE_INSTALL_PREFIX:STRING=$(PREFIX)
CMAKE_NATIVE = $(CMAKECONFIG) \
-DCMAKE_INSTALL_PREFIX:STRING=$(BUILDPREFIX)
ifndef WITH_OPTIMIZATION
CMAKE += -DCMAKE_BUILD_TYPE=Debug
else
CMAKE += -DCMAKE_BUILD_TYPE=RelWithDebInfo
endif
ifdef HAVE_WIN32
CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=
endif
@ -678,11 +683,6 @@ endif
# CMake toolchain
CMAKE_TOOLCHAIN_ENV := $(HOSTTOOLS) HOST_ARCH="$(ARCH)" SYSTEM_NAME="$(CMAKE_SYSTEM_NAME)"
ifndef WITH_OPTIMIZATION
CMAKE_TOOLCHAIN_ENV += BUILD_TYPE=Debug
else
CMAKE_TOOLCHAIN_ENV += BUILD_TYPE=RelWithDebInfo
endif
ifdef HAVE_WIN32
ifdef HAVE_CROSS_COMPILE
CMAKE_TOOLCHAIN_ENV += RC_COMPILER="$(WINDRES)"