Merge branch 'wip/baedert/for-master' into 'master'

build: Print toolchain in summary

See merge request GNOME/gtk!4022
This commit is contained in:
Matthias Clasen
2021-10-02 16:03:46 +00:00
3 changed files with 5 additions and 2 deletions

View File

@@ -44,7 +44,7 @@ struct error_handler_data {
GError **error;
};
static void
G_GNUC_NORETURN static void
fatal_error_handler (j_common_ptr cinfo)
{
struct error_handler_data *errmgr;

View File

@@ -106,7 +106,7 @@ png_free_callback (png_structp o,
g_free (x);
}
static void
G_GNUC_NORETURN static void
png_simple_error_callback (png_structp png,
png_const_charp error_msg)
{

View File

@@ -899,6 +899,9 @@ summary('Sysprof support', libsysprof_capture_dep.found(), section: 'Features')
summary('Colord support', colord_dep.found(), section: 'Features')
summary('Tracker support', tracker3_dep.found(), section: 'Features')
summary('Compiler', cc.get_id(), section: 'Toolchain')
summary('Linker', cc.get_linker_id(), section: 'Toolchain')
# Build
summary('Debugging', get_option('debug'), section: 'Build')
summary('Optimization', get_option('optimization'), section: 'Build')