diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2012-07-24 23:02:18 -0700 |
|---|---|---|
| committer | Vinson Lee <vlee@freedesktop.org> | 2012-07-25 17:04:30 -0700 |
| commit | 4f109ca4e8ca2c1f0a60b52fa79dd907777e8bee (patch) | |
| tree | 0b305c7b8a8954acdb9834e961b181297df3d104 /scons | |
| parent | cc44aa77490e1360b099eb0b887266f434298b4f (diff) | |
| download | external_mesa3d-4f109ca4e8ca2c1f0a60b52fa79dd907777e8bee.zip external_mesa3d-4f109ca4e8ca2c1f0a60b52fa79dd907777e8bee.tar.gz external_mesa3d-4f109ca4e8ca2c1f0a60b52fa79dd907777e8bee.tar.bz2 | |
scons: Fix build with clang.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'scons')
| -rwxr-xr-x | scons/gallium.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index 001a5de..458651b 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -140,6 +140,7 @@ def generate(env): env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-') env['msvc'] = env['CC'] == 'cl' env['suncc'] = env['platform'] == 'sunos' and os.path.basename(env['CC']) == 'cc' + env['clang'] = env['CC'] == 'clang' if env['msvc'] and env['toolchain'] == 'default' and env['machine'] == 'x86_64': # MSVC x64 support is broken in earlier versions of scons @@ -482,7 +483,7 @@ def generate(env): env.Append(SHLINKFLAGS = shlinkflags) # We have C++ in several libraries, so always link with the C++ compiler - if env['gcc']: + if env['gcc'] or env['clang']: env['LINK'] = env['CXX'] # Default libs |