Mesa (master): scons: We have C++ in several libraries, so always link with the C++ compiler

[Jose Fonseca]

Module: Mesa
Branch: master
Commit: 11b15c4d254ee689183306579d9c4851e29c3c4a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=11b15c4d254ee689183306579d9c4851e29c3c4a

Author: José Fonseca <jfonseca at vmware.com>
Date:   Sun Jan 30 11:17:07 2011 +0000

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(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index 75e9b9e..df060f0 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 1b033ac..3fef9e0 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