diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index ecaf148aae..c3ba90cecc 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -165,6 +165,10 @@ libEGL_mesa_la_LDFLAGS = \
 	$(GC_SECTIONS) \
 	$(LD_NO_UNDEFINED)
 
+# Force C++ link for mesautil in EGL_common.la,
+# see "Libtool Convenience Libraries" in Automake manual
+nodist_EXTRA_libEGL_mesa_la_SOURCES = dummy.cpp
+
 else # USE_LIBGLVND
 
 lib_LTLIBRARIES = libEGL.la
@@ -177,6 +181,10 @@ libEGL_la_LDFLAGS = \
 	$(GC_SECTIONS) \
 	$(LD_NO_UNDEFINED)
 
+# Force C++ link for mesautil in EGL_common.la,
+# see "Libtool Convenience Libraries" in Automake manual
+nodist_EXTRA_libEGL_la_SOURCES = dummy.cpp
+
 endif # USE_LIBGLVND
 
 include $(top_srcdir)/install-lib-links.mk