scons: We have C++ in several libraries, so always link with the C++ compiler
Prevents missing symbols in libGL.so when LLVM is disabled.
This commit is contained in:
parent
cad0520179
commit
11b15c4d25
|
@ -551,6 +551,10 @@ def generate(env):
|
||||||
env.Append(LINKFLAGS = linkflags)
|
env.Append(LINKFLAGS = linkflags)
|
||||||
env.Append(SHLINKFLAGS = shlinkflags)
|
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
|
# Default libs
|
||||||
env.Append(LIBS = [])
|
env.Append(LIBS = [])
|
||||||
|
|
||||||
|
|
|
@ -147,8 +147,6 @@ def generate(env):
|
||||||
except OSError:
|
except OSError:
|
||||||
print 'scons: llvm-config version %s failed' % llvm_version
|
print 'scons: llvm-config version %s failed' % llvm_version
|
||||||
return
|
return
|
||||||
else:
|
|
||||||
env['LINK'] = env['CXX']
|
|
||||||
|
|
||||||
assert llvm_version is not None
|
assert llvm_version is not None
|
||||||
env['llvm'] = True
|
env['llvm'] = True
|
||||||
|
|
Loading…
Reference in New Issue