commit 94e652786cb7bbf750d37816c4f099aa4081f4be
author Galina Kistanova <gkistanova@gmail.com> Thu Sep 17 19:06:24 2020 -0700
committer Galina Kistanova <gkistanova@gmail.com> Thu Sep 17 19:06:24 2020 -0700
tree 1f32d02ab0f2d013fe5462c20847420835630a19
parent 3b3349e94a30eb9608e44f335ba74119311d714c

Changed to use cmake arguments to specify C and C++ compilers.

zorg/buildbot/builders/ClangBuilder.py

diff --git a/zorg/buildbot/builders/ClangBuilder.py b/zorg/buildbot/builders/ClangBuilder.py
index e75ee06..b1ea05f 100644
--- a/zorg/buildbot/builders/ClangBuilder.py
+++ b/zorg/buildbot/builders/ClangBuilder.py
@@ -404,10 +404,9 @@
         # env.exe helper is required to run the tests, so hopefully it's already on
         # PATH.
         rel_src_dir = LLVMBuildFactory.pathRelativeToBuild(f.llvm_srcdir, stage2_build)
-        cmake_cmd2 = ['env',
-                      WithProperties('CC=%(workdir)s/'+stage1_install+'/bin/'+cc),
-                      WithProperties('CXX=%(workdir)s/'+stage1_install+'/bin/'+cxx),
-                      cmake, "-G", "Ninja", rel_src_dir,
+        cmake_cmd2 = [cmake, "-G", "Ninja", rel_src_dir,
+                      WithProperties("-DCMAKE_CXX_COMPILER=%(workdir)s/"+stage1_install+"/bin/"+cc),
+                      WithProperties("-DCMAKE_CXX_COMPILER=%(workdir)s/"+stage1_install+"/bin/"+cxx),
                       "-DCMAKE_BUILD_TYPE="+stage2_config,
                       "-DLLVM_ENABLE_ASSERTIONS=True",
                       "-DLLVM_LIT_ARGS="+lit_args,