From ad58f0d9e021065d8e6d82e1aa7387dcd206f86e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 24 Aug 2010 12:18:09 -0700
Subject: make: Use C++ compiler to link stdc++ library.

glxinfo and glxgears run on swrast and softpipe without undefined symbol
errors.
---
 src/glx/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/glx')

diff --git a/src/glx/Makefile b/src/glx/Makefile
index 9a22d0c547..ba5708ffed 100644
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -71,8 +71,9 @@ default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
 # Make libGL
 $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
-	$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major 1 -minor 2 $(MKLIB_OPTIONS) \
+	$(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+		-major 1 -minor 2 \
+		-cplusplus $(MKLIB_OPTIONS) \
 		-install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \
 		$(GL_LIB_DEPS) $(OBJECTS) $(GLAPI_LIB)
 
-- 
cgit v1.2.3