[zorg] r321347 - [zorg] Just use make rather than ninja for the riscv builder

Alex Bradbury via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 21 23:27:04 PST 2017


Author: asb
Date: Thu Dec 21 23:27:04 2017
New Revision: 321347

URL: http://llvm.org/viewvc/llvm-project?rev=321347&view=rev
Log:
[zorg] Just use make rather than ninja for the riscv builder

getLLVMCMakeBuildFactory has issues when using ninja rather than make.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=321347&r1=321346&r2=321347&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Dec 21 23:27:04 2017
@@ -94,10 +94,9 @@ def _get_llvm_builders():
          'builddir':"llvm-riscv-linux",
          'factory': LLVMBuilder.getLLVMCMakeBuildFactory(
                         timeout=40, config_name='Release',
-                        make='ninja',
                         enable_shared=True,
                         extra_cmake_args=[
-                          "-G", "Ninja",
+                          "-G", "Unix Makefiles",
                           "-DCMAKE_BUILD_TYPE:STRING=Release",
                           # We need to compile the X86 backend due to a few generic CodeGen tests.
                           "-DLLVM_TARGETS_TO_BUILD:STRING=RISCV;X86",




More information about the llvm-commits mailing list