summaryrefslogtreecommitdiff
path: root/src/gallium/SConscript
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-03-13 13:39:05 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-03-13 13:39:05 +1100
commit03ec66375889f049b09f39ba98515aa35ac48164 (patch)
treee149d8defb52b1252af982b459902ee0800b17cd /src/gallium/SConscript
parentbd4fe0e87c1b979973d9a76aa48de5fbbb8d52b7 (diff)
parent2366bb1baf2e9ae5b6ecf19f66ae9e0a4b0d2f36 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/SConscript')
-rw-r--r--src/gallium/SConscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index fa4833cbcf..f09778ce99 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -9,6 +9,9 @@ auxiliaries = []
Export('auxiliaries')
+if llvm:
+ SConscript(['auxiliary/gallivm/SConscript'])
+
SConscript([
# NOTE: order matters!
'auxiliary/util/SConscript',
@@ -19,8 +22,5 @@ SConscript([
'auxiliary/pipebuffer/SConscript',
])
-if llvm:
- SConscript(['auxiliary/gallivm/SConscript'])
-
for driver in env['drivers']:
SConscript(os.path.join('drivers', driver, 'SConscript'))