From 11b15c4d254ee689183306579d9c4851e29c3c4a Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Sun, 30 Jan 2011 11:17:07 +0000
Subject: scons: We have C++ in several libraries, so always link with the C++
 compiler

Prevents missing symbols in libGL.so when LLVM is disabled.
---
 scons/gallium.py | 4 ++++
 scons/llvm.py    | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'scons')

diff --git a/scons/gallium.py b/scons/gallium.py
index 75e9b9e7fc..df060f01a3 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -551,6 +551,10 @@ def generate(env):
     env.Append(LINKFLAGS = linkflags)
     env.Append(SHLINKFLAGS = shlinkflags)
 
+    # We have C++ in several libraries, so always link with the C++ compiler
+    if env['gcc']:
+        env['LINK'] = env['CXX']
+
     # Default libs
     env.Append(LIBS = [])
 
diff --git a/scons/llvm.py b/scons/llvm.py
index 1b033acb1b..3fef9e0900 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -147,8 +147,6 @@ def generate(env):
         except OSError:
             print 'scons: llvm-config version %s failed' % llvm_version
             return
-        else:
-            env['LINK'] = env['CXX']
 
     assert llvm_version is not None
     env['llvm'] = True
-- 
cgit v1.2.3