diff --git a/llvmcore.mk b/llvmcore.mk
index 4358601..fe0bb97 100644
--- a/llvmcore.mk
+++ b/llvmcore.mk
@@ -3,4 +3,4 @@
 include configs/linux-llvm.llvmcore
 
 llvmcore:
-	gcc -fPIC -shared -o libllvmcore-$(shell llvm-config --version).so -Wl,--whole-archive $(shell llvm-config --ldflags) $(LLVM_LIBS) -Wl,--no-whole-archive
+	g++ -fPIC -shared -o libllvmcore-$(shell llvm-config --version).so -Wl,--whole-archive $(shell llvm-config --ldflags) $(LLVM_LIBS) -Wl,--no-whole-archive
diff --git a/mesa.spec b/mesa.spec
index 265d4d6..db37af5 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -15,7 +15,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.10
-Release: 0.28%{?dist}
+Release: 0.29%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -474,6 +474,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libOSMesa.so
 
 %changelog
+* Mon Mar 14 2011 Dave Airlie <airlied@redhat.com> 7.10-0.29
+- use g++ to link llvmcore.so so it gets libstdc++ (#674079)
+
 * Fri Mar 04 2011 Dan Horák <dan[at]danny.cz> 7.10-0.28
 - enable gallium-llvm only when with_hardware is set (workarounds linking
   failure on s390(x))