projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 128190e)
scons: Handle Python OSError exception when missing libdrm_radeon.
authorVinson Lee <vlee@vmware.com>
Thu, 3 Jun 2010 07:03:18 +0000 (00:03 -0700)
committerVinson Lee <vlee@vmware.com>
Thu, 3 Jun 2010 07:08:22 +0000 (00:08 -0700)
Instead of crashing when libdrm_radeon is unavailable, the SCons build
just does not build r600g.

src/gallium/drivers/r600/SConscript patch | blob | history

diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
index 8c9edd897b2dd1e8c686c4c57b02782e0e22bf92..26e2f1941cc91e7fc4ce91b9be2cc912a072f2ba 100644 (file)
--- 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',