X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=88cdffa5048f747a970bdc3fd6ae394eae41bcb0;hb=7c8836e9ef49d938aa55a1c385b95c6371c301f1;hp=c1dc62465191eb1794a076e3f4d0c756f2ad66e5;hpb=7513bc3886b69335e7976b2c9bbde8e928485818;p=mesa.git

diff --git a/SConstruct b/SConstruct
index c1dc6246519..88cdffa5048 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,12 +70,14 @@ platform = env['platform']
 
 # derived options
 x86 = machine == 'x86'
+ppc = machine == 'ppc'
 gcc = platform in ('linux', 'freebsd', 'darwin')
 msvc = platform in ('windows', 'winddk')
 
 Export([
 	'debug', 
 	'x86', 
+	'ppc', 
 	'dri', 
 	'llvm',
 	'platform',
@@ -131,7 +133,7 @@ if dri:
 # LLVM
 if llvm:
 	# See also http://www.scons.org/wiki/UsingPkgConfig
-	env.ParseConfig('llvm-config --cflags --ldflags --libs')
+	env.ParseConfig('llvm-config --cflags --ldflags --libs backend bitreader engine ipo')
 	env.Append(CPPDEFINES = ['MESA_LLVM'])
         # Force C++ linkage
 	env['LINK'] = env['CXX']
@@ -160,6 +162,6 @@ Export('env')
 
 SConscript(
 	'src/SConscript',
-	build_dir = env['build'],
+	variant_dir = env['build'],
 	duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )