[zorg] r351780 - Only add one property WithProperties invocation

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Mon Jan 21 20:31:45 PST 2019


Author: phosek
Date: Mon Jan 21 20:31:44 2019
New Revision: 351780

URL: http://llvm.org/viewvc/llvm-project?rev=351780&view=rev
Log:
Only add one property WithProperties invocation

This is triggering a key error.

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

Modified: zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py?rev=351780&r1=351779&r2=351780&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py Mon Jan 21 20:31:44 2019
@@ -112,8 +112,11 @@ def getToolchainBuildFactory(
 
     cmake_options.append(
         WithProperties(
-            "-DCMAKE_INSTALL_PREFIX=%(workdir)s/" + install_dir,
-            "-DFUCHSIA_SDK=%(workdir)s/" + sdk_dir,
+            "-DCMAKE_INSTALL_PREFIX=%(workdir)s/" + install_dir
+        ))
+    cmake_options.append(
+        WithProperties(
+            "-DFUCHSIA_SDK=%(workdir)s/" + sdk_dir
         ))
 
     CmakeCommand.applyRequiredOptions(cmake_options, [




More information about the llvm-commits mailing list