Mesa (master): scons: Fix build without llvm.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Mon Apr 30 06:46:27 UTC 2012
Module: Mesa
Branch: master
Commit: 4c23acb269b3d30b9840fcb36edf01410b2f9213
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c23acb269b3d30b9840fcb36edf01410b2f9213
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date: Mon Apr 30 07:47:01 2012 +0100
scons: Fix build without llvm.
radeonsi depends on llvm, so it must be disabled if llvm support is not enabled.
---
src/gallium/SConscript | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index da2e4dd..962c154 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -33,8 +33,11 @@ if env['drm']:
SConscript([
'drivers/r300/SConscript',
'drivers/r600/SConscript',
- 'drivers/radeonsi/SConscript',
])
+ if env['llvm']:
+ SConscript([
+ 'drivers/radeonsi/SConscript',
+ ])
# XXX: nouveau drivers have a tight dependency on libdrm, so to enable
# we need some version logic before we enable them. Also, ATM there is
# no nouveau target in scons
@@ -153,8 +156,11 @@ if not env['embedded']:
SConscript([
'targets/dri-r300/SConscript',
'targets/dri-r600/SConscript',
- 'targets/dri-radeonsi/SConscript',
])
+ if env['llvm']:
+ SConscript([
+ 'targets/dri-radeonsi/SConscript',
+ ])
if env['xorg'] and env['drm']:
SConscript([
More information about the mesa-commit
mailing list