[zorg] r249028 - Fix for Libiomp5Builder.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Thu Oct  1 11:42:02 2015
New Revision: 249028

URL: http://llvm.org/viewvc/llvm-project?rev=249028&view=rev
Log:
Fix for Libiomp5Builder.
Patch by Fedorova Vera.

Modified:
    zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py

Modified: zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py?rev=249028&r1=249027&r2=249028&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py Thu Oct  1 11:42:02 2015
@@ -63,17 +63,14 @@ def getLibompCMakeBuildFactory(clean=Tru
 
     # Make llvm utils
     f.addStep(WarningCountingShellCommand(name='make llvm utils build',
-                                          command=['make LLVMX86Utils -j8'],
+                                          command=['make', 'LLVMX86Utils', '-j8'],
                                           haltOnFailure=True,
                                           description='make llvm utils build',
                                           workdir=llvm_builddir,
                                           env=merged_env))
 
     # Add llvm-lit to PATH
-    llvm_lit_env = { 
-        'PATH' : WithProperties("${PATH}:" + "%(workdir)s/" + llvm_builddir + "/bin"),
-        }
-    merged_env.update(llvm_lit_env)
+    merged_env.update( { 'PATH' : WithProperties("${PATH}:" + "%(workdir)s/" + llvm_builddir + "/bin")} )
 
     # CMake libomp
     f.addStep(ShellCommand(name='cmake libomp',