From 625651cf813f2b18626f0d26e68e3a2935325b8d Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Fri, 17 Aug 2012 11:16:45 -0700
Subject: [PATCH] build/x11: Force usage of C++ linker

Tested-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/mesa/drivers/x11/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index d9f342308bd..dab4d6bec8f 100644
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -50,6 +50,9 @@ lib@GL_LIB@_la_SOURCES = \
 	xm_line.c \
 	xm_tri.c
 
+# Force usage of a C++ linker
+nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
+
 GL_MAJOR = 1
 GL_MINOR = 6
 GL_PATCH = 0
-- 
2.30.2