diff --git a/SConstruct b/SConstruct
index 6f95d123ff2..dd118dfbb87 100644
--- a/SConstruct
+++ b/SConstruct
@@ -206,7 +206,10 @@ if llvm:
 	env.ParseConfig('llvm-config --cflags --ldflags --libs')
 	env.Append(CPPDEFINES = ['MESA_LLVM'])
 	env.Append(CXXFLAGS = ['-Wno-long-long'])
-	
+
+# Force C++ linkage
+if env['PLATFORM'] in ('posix',):
+	env['LINK'] = env['CXX']
 
 # libGL
 if platform not in ('winddk',):