diff options
| author | Vinson Lee <[email protected]> | 2011-01-31 10:46:30 -0800 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2011-01-31 10:50:06 -0800 |
| commit | 8c115aa247d4a2cfee5d35c5fdd6f56951060c6c (patch) | |
| tree | 102acbd753cc9fd872e7f5952bb0df4f5b08381f /src | |
| parent | 1568b19e3b20275f8e56811ef8073aa2584666b1 (diff) | |
scons: Gracefully handle pkg-config errors with libdrm_radeon.
Print warnings and continue build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/winsys/r600/drm/SConscript | 7 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/SConscript | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript index f97434e995d..cc9a06a2393 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( diff --git a/src/gallium/winsys/radeon/drm/SConscript b/src/gallium/winsys/radeon/drm/SConscript index 80816621848..4ddb0919f6a 100644 --- a/src/gallium/winsys/radeon/drm/SConscript +++ b/src/gallium/winsys/radeon/drm/SConscript @@ -9,7 +9,12 @@ radeon_sources = [ 'radeon_r300.c', ] -env.ParseConfig('pkg-config --cflags libdrm_radeon') +try: + env.ParseConfig('pkg-config --cflags libdrm_radeon') +except: + print 'warning: not building r300g' + Return() + env.Append(CPPPATH = '#/src/gallium/drivers/r300') radeonwinsys = env.ConvenienceLibrary( |