diff --git a/gdk/loaders/gdkjpeg.c b/gdk/loaders/gdkjpeg.c
index 68832de078..b7c3bbacd5 100644
--- a/gdk/loaders/gdkjpeg.c
+++ b/gdk/loaders/gdkjpeg.c
@@ -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;
diff --git a/gdk/loaders/gdkpng.c b/gdk/loaders/gdkpng.c
index 4c32533e36..97e6dfffd0 100644
--- a/gdk/loaders/gdkpng.c
+++ b/gdk/loaders/gdkpng.c
@@ -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)
 {
diff --git a/meson.build b/meson.build
index dd6e9d6471..bea2015429 100644
--- a/meson.build
+++ b/meson.build
@@ -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')