summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-06-03 00:03:18 -0700
committerVinson Lee <vlee@vmware.com>2010-06-03 00:08:22 -0700
commitd062d2141618e5f5950410b4da84b4d62d43c1be (patch)
tree418428d7dcf027ee8bce23d6b0f26caae28cf5bd
parent128190e4a908ab92690cba4e59e3e5fa42e98f6f (diff)
scons: Handle Python OSError exception when missing libdrm_radeon.
Instead of crashing when libdrm_radeon is unavailable, the SCons build just does not build r600g.
-rw-r--r--src/gallium/drivers/r600/SConscript6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
index 8c9edd897b2..26e2f1941cc 100644
--- a/src/gallium/drivers/r600/SConscript
+++ b/src/gallium/drivers/r600/SConscript
@@ -2,7 +2,11 @@ Import('*')
env = env.Clone()
-env.ParseConfig('pkg-config --cflags libdrm_radeon')
+try:
+ env.ParseConfig('pkg-config --cflags libdrm_radeon')
+except OSError:
+ print 'warning: not building r600'
+ Return()
env.Append(CPPPATH = [
'#/include',