radeonsi: tell LLVM not to remove s_barrier instructions

[mesa.git] / src / gallium / drivers / llvmpipe / SConscript

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 20500fd834ff41121c9bebae8c8f8b95999c18e3..fbbd22a52999bde27f7df429a4ed13d37dfce814 100644 (file)
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -9,6 +9,8 @@ if not env['llvm']:
 
 env = env.Clone()
 
+env.MSVC2013Compat()
+
 llvmpipe = env.ConvenienceLibrary(
        target = 'llvmpipe',
        source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
@@ -20,28 +22,22 @@ env.Alias('llvmpipe', llvmpipe)
 if not env['embedded']:
     env = env.Clone()
 
-    env.Prepend(LIBS = [llvmpipe] + gallium)
+    env.Prepend(LIBS = [llvmpipe, gallium, mesautil])
 
     tests = [
+        'arit',
         'format',
         'blend',
         'conv',
         'printf',
     ]
 
-    if not env['msvc']:
-        tests.append('arit')
-
     for test in tests:
         testname = 'lp_test_' + test
         target = env.Program(
             target = testname,
             source = [testname + '.c', 'lp_test_main.c'],
         )
-        env.InstallProgram(target)
-        
-        # http://www.scons.org/wiki/UnitTests
-        alias = env.Alias(testname, [target], target[0].abspath)
-        AlwaysBuild(alias)
+        env.UnitTest(testname, target)
 
 Export('llvmpipe')