Add cmake-3.17.0 to PATH on hexagon builders

llvm · Apr 21, 2020 · 45b2030 · 45b2030
1 parent ea5af17
commit 45b2030
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
@@ -622,7 +622,7 @@ def _get_clang_builders():
             checkout_clang_tools_extra=False,
             checkout_compiler_rt=False,
             checkout_lld=False,
-            env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib'},
+            env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib', 'PATH': ['/local/cmake-3.17.0/bin', '${PATH}']},
             extra_cmake_args=[
               "-DCMAKE_BUILD_TYPE:STRING=Release",
               "-DLLVM_TARGETS_TO_BUILD:STRING=Hexagon",
@@ -820,7 +820,7 @@ def _get_polly_builders():
                 install=True,
                 make='ninja',
                 jobs=16,
-                env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib'},
+                env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib', 'PATH': ['/local/cmake-3.17.0/bin', '${PATH}']},
                 extraCmakeArgs=["-G", "Ninja",
                                 "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                 "-DLLVM_DEFAULT_TARGET_TRIPLE=arm-linux-gnueabi",
@@ -866,7 +866,7 @@ def _get_aosp_builders():
                 target_flags="-Wno-error -O3 -mllvm -polly -mllvm -polly-position=before-vectorizer -mllvm -polly-process-unprofitable -fcommon",
                 jobs=8,
                 extra_make_args=None,
-                env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib'},
+                env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib', 'PATH': ['/local/cmake-3.17.0/bin', '${PATH}']},
                 clean=False,
                 sync=False,
                 patch=None)}
@@ -883,7 +883,7 @@ def _get_rev_iter_builders():
                 make='ninja',
                 jobs=16,
                 checkAll=True,
-                env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib'},
+                env={'LD_LIBRARY_PATH': '/local/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/lib', 'PATH': ['/local/cmake-3.17.0/bin', '${PATH}']},
                 extraCmakeArgs=["-G", "Ninja",
                                 "-DLLVM_REVERSE_ITERATION:BOOL=ON",
                                 "-DLLVM_ENABLE_ASSERTIONS=True",