summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/r600
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2011-01-31 10:46:30 -0800
committerVinson Lee <vlee@vmware.com>2011-01-31 10:50:06 -0800
commit8c115aa247d4a2cfee5d35c5fdd6f56951060c6c (patch)
tree102acbd753cc9fd872e7f5952bb0df4f5b08381f /src/gallium/winsys/r600
parent1568b19e3b20275f8e56811ef8073aa2584666b1 (diff)
scons: Gracefully handle pkg-config errors with libdrm_radeon.
Print warnings and continue build.
Diffstat (limited to 'src/gallium/winsys/r600')
-rw-r--r--src/gallium/winsys/r600/drm/SConscript7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript
index f97434e995..cc9a06a239 100644
--- a/src/gallium/winsys/r600/drm/SConscript
+++ b/src/gallium/winsys/r600/drm/SConscript
@@ -13,7 +13,12 @@ r600_sources = [
'r600_bomgr.c',
]
-env.ParseConfig('pkg-config --cflags libdrm_radeon')
+try:
+ env.ParseConfig('pkg-config --cflags libdrm_radeon')
+except OSError:
+ print 'warning: not building r600g'
+ Return()
+
env.Append(CPPPATH = '#/src/gallium/drivers/r600')
r600winsys = env.ConvenienceLibrary(