summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-01-30 11:17:07 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-01-30 11:19:44 +0000
commit11b15c4d254ee689183306579d9c4851e29c3c4a (patch)
treef1a256d2e585087ac969abaeffc3063c25418c5a /scons
parentcad0520179ef2a62b2756b01d37663f495a00619 (diff)
scons: We have C++ in several libraries, so always link with the C++ compiler
Prevents missing symbols in libGL.so when LLVM is disabled.
Diffstat (limited to 'scons')
-rw-r--r--scons/gallium.py4
-rw-r--r--scons/llvm.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 75e9b9e7fc3..df060f01a3c 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 1b033acb1b3..3fef9e0900d 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