Module: Mesa Branch: master Commit: 43f8a82a76599c10fa33ef35b6500924768de90c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=43f8a82a76599c10fa33ef35b6500924768de90c
Author: Zack Rusin <za...@vmware.com> Date: Tue Feb 9 00:00:35 2010 -0500 scons: don't assume llvm is always present --- SConstruct | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 76ab902..fa67d14 100644 --- a/SConstruct +++ b/SConstruct @@ -170,8 +170,11 @@ if dri: if drawllvm: # See also http://www.scons.org/wiki/UsingPkgConfig # currently --ldflags --libsdisabled since the driver will force the correct linkage - env.ParseConfig('llvm-config --cflags backend bitreader engine instrumentation interpreter ipo') - env.Append(CPPDEFINES = ['DRAW_LLVM']) + env.Tool('llvm') + if not env.has_key('LLVM_VERSION'): + drawllvm = False + else: + env.Append(CPPDEFINES = ['DRAW_LLVM']) # libGL if platform in ('linux', 'freebsd', 'darwin'): _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit