[zorg] r205118 - openmp build script: allow to override environment variables

[Dmitri Gribenko]

Author: gribozavr
Date: Sat Mar 29 20:43:14 2014
New Revision: 205118

URL: http://llvm.org/viewvc/llvm-project?rev=205118&view=rev
Log:
openmp build script: allow to override environment variables

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=205118&r1=205117&r2=205118&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py Sat Mar 29 20:43:14 2014
@@ -13,6 +13,9 @@ def getLibiomp5BuildFactory(clean=True,
     merged_env = {
         'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
                  }
+    if env is not None:
+        # Overwrite pre-set items with the given ones, so user can set anything.
+        merged_env.update(env)
 
     openmp_srcdir = "openmp.src"