From 4c23acb269b3d30b9840fcb36edf01410b2f9213 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Mon, 30 Apr 2012 07:47:01 +0100 Subject: scons: Fix build without llvm. radeonsi depends on llvm, so it must be disabled if llvm support is not enabled. --- src/gallium/SConscript | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gallium/SConscript b/src/gallium/SConscript index da2e4dd5ded..962c1545f64 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -33,8 +33,11 @@ if env['drm']: SConscript([ 'drivers/r300/SConscript', 'drivers/r600/SConscript', - 'drivers/radeonsi/SConscript', ]) + if env['llvm']: + SConscript([ + 'drivers/radeonsi/SConscript', + ]) # XXX: nouveau drivers have a tight dependency on libdrm, so to enable # we need some version logic before we enable them. Also, ATM there is # no nouveau target in scons @@ -153,8 +156,11 @@ if not env['embedded']: SConscript([ 'targets/dri-r300/SConscript', 'targets/dri-r600/SConscript', - 'targets/dri-radeonsi/SConscript', ]) + if env['llvm']: + SConscript([ + 'targets/dri-radeonsi/SConscript', + ]) if env['xorg'] and env['drm']: SConscript([ -- cgit v1.2.3