Index: zorg/buildbot/builders/PollyBuilder.py =================================================================== --- zorg/buildbot/builders/PollyBuilder.py +++ zorg/buildbot/builders/PollyBuilder.py @@ -70,11 +70,16 @@ haltOnFailure=False, description=["create build dir"], workdir=".")) + cmakeCommand = ["cmake", "../%s" %llvm_srcdir, "-DCMAKE_COLOR_MAKEFILE=OFF", "-DPOLLY_TEST_DISABLE_BAR=ON", - "-DPOLLY_ENABLE_GPGPU_CODEGEN=ON", "-DCMAKE_BUILD_TYPE=Release"] + cmake_install + extraCmakeArgs + hasNVPTX = any('LLVM_TARGETS_TO_BUILD' in A and 'NVPTX' in A + for A in reversed(extraCmakeArgs)) + if hasNVPTX: # The NVPTX target is required to generate GPU code + cmakeCommand.append("-DPOLLY_ENABLE_GPGPU_CODEGEN=ON") + f.addStep(ShellCommand(name="cmake-configure", command=cmakeCommand, haltOnFailure=False, @@ -210,6 +215,6 @@ LNTBuilder.AddLNTTestsToFactory(f, nt_flags, cc_path=(llvm_install_dir+'/bin/clang'), cxx_path=(llvm_install_dir+'/bin/clang++'), - **lnt_args); + **lnt_args) return f