Merge branch 'master' into r300-compiler

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c

1 files changed, 72 insertions, 0 deletions

diff --git a/scons/llvm.py b/scons/llvm.py
new file mode 100644
index 00000000000..702f1e354f6
--- /dev/null
+++ b/scons/llvm.py
@@ -0,0 +1,72 @@
+"""llvm
+
+Tool-specific initialization for LLVM
+
+"""
+
+#
+# Copyright (c) 2009 VMware, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+import os
+import os.path
+
+import SCons.Errors
+import SCons.Util
+
+
+def generate(env):
+    try:
+        llvm_dir = os.environ['LLVM']
+    except KeyError:
+        # Do nothing -- use the system headers/libs
+        pass
+    else:
+        if not os.path.isdir(llvm_dir):
+            raise SCons.Errors.InternalError, "Specified LLVM directory not found"
+
+        if env['debug']:
+            llvm_subdir = 'Debug'
+        else:
+            llvm_subdir = 'Release'
+
+        llvm_bin_dir = os.path.join(llvm_dir, llvm_subdir, 'bin')
+        if not os.path.isdir(llvm_bin_dir):
+            raise SCons.Errors.InternalError, "LLVM build directory not found"
+
+        env.PrependENVPath('PATH', llvm_bin_dir)
+
+    if env.Detect('llvm-config'):
+        try:
+            env['LLVM_VERSION'] = env.backtick('llvm-config --version')
+        except AttributeError:
+            env['LLVM_VERSION'] = 'X.X'
+
+        env.ParseConfig('llvm-config --cppflags')
+        env.ParseConfig('llvm-config --libs jit interpreter nativecodegen bitwriter')
+        env.ParseConfig('llvm-config --ldflags')
+        env['LINK'] = env['CXX']
+
+def exists(env):
+    return True
+
+# vim:set ts=4 sw=4 et: