[vlc-commits] contrib: add debug info for cmake and meson

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Mon Apr 27 10:19:36 2020 +0200| [787d886450187b56176d74d4cb2e1c3f138cf174] | committer: Alexandre Janniaux

contrib: add debug info for cmake and meson

Other buildsystems are compiled with -g inconditionnally. As we
generally extract and strip debug info, make sure they are generated so
that overlayered build scripts don't need to add `-g` flag in CFLAGS.

It is particularily important since adding `-g` flag in CFLAGS confuses
meson detection for underscore prefixing.

See videolan/VLCKit#360.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=787d886450187b56176d74d4cb2e1c3f138cf174
---

 contrib/src/main.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 10282bd29a..0a731f11dc 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -408,7 +408,7 @@ MESONFLAGS = --default-library static --prefix "$(PREFIX)" --backend ninja \
 ifndef WITH_OPTIMIZATION
 MESONFLAGS += --buildtype debug
 else
-MESONFLAGS += --buildtype release
+MESONFLAGS += --buildtype debugoptimized
 endif
 
 ifdef HAVE_CROSS_COMPILE
@@ -565,7 +565,7 @@ toolchain.cmake:
 ifndef WITH_OPTIMIZATION
 	echo "set(CMAKE_BUILD_TYPE Debug)" >> $@
 else
-	echo "set(CMAKE_BUILD_TYPE Release)" >> $@
+	echo "set(CMAKE_BUILD_TYPE RelWithDebInfo)" >> $@
 endif
 	echo "set(CMAKE_SYSTEM_PROCESSOR $(ARCH))" >> $@
 	if test -n "$(CMAKE_SYSTEM_NAME)"; then \