Update for LLVM 3.1

git-svn-id: http://svn.drobilla.net/resp/trunk@433 ad02d1e2-f140-0410-9f75-f8b11f17cedd

1 files changed, 13 insertions, 10 deletions

diff --git a/wscript b/wscript
index f7054a2..3a50203 100644
--- a/wscript
+++ b/wscript
@@ -42,7 +42,7 @@ def configure(conf):
     conf.env.append_unique('CFLAGS', '-std=c99')
 
     conf.check_cfg(
-        path         = 'llvm-config-2.9',
+        path         = 'llvm-config-3.1',
         args         = '--cppflags --ldflags --libs core jit native codegen ipo',
         package      = '',
         uselib_store = 'LLVM',
@@ -50,11 +50,11 @@ def configure(conf):
 
     if not conf.is_defined('HAVE_LLVM'):
         conf.check_cfg(
-            path         = 'llvm-config-2.8',
+            path         = 'llvm-config-3.0',
             args         = '--cppflags --ldflags --libs core jit native codegen ipo',
             package      = '',
             uselib_store = 'LLVM',
-            mandatory    = True)
+            mandatory    = False)
 
 def build(bld):
     source = '''
@@ -83,13 +83,16 @@ def build(bld):
 
 def test(ctx):
     def run_test(prog, correct_out):
-        out = subprocess.check_output(['./build/resp', prog]).strip()
-        if out == correct_out:
-            Logs.info("PASS: %s" % prog)
-        else:
-            Logs.error("FAIL:     %s" % prog)
-            Logs.error("Expected: %s" % correct_out)
-            Logs.error("Got:      %s" % out)
+        try:
+            out = subprocess.check_output(['./build/resp', prog]).strip()
+            if out == correct_out:
+                Logs.info("PASS: %s" % prog)
+            else:
+                Logs.error("FAIL:     %s" % prog)
+                Logs.error("Expected: %s" % correct_out)
+                Logs.error("Got:      %s" % out)
+        except:
+            Logs.error("ERROR:    %s" % prog)
 
     # Basic lexical sanity
     run_test('./test/def.resp',         '4 : Int')