| commit | b1f29b16a0393e02de811f622ab39789bb899abe | [log] [tgz] |
|---|---|---|
| author | Vitaly Buka <vitalybuka@google.com> | Wed Aug 28 08:04:40 2019 +0000 |
| committer | Vitaly Buka <vitalybuka@google.com> | Wed Aug 28 08:04:40 2019 +0000 |
| tree | 7185eef22b57c8c3ec391ff2ca1c293d7d1464c9 | |
| parent | 07ca372ec8225a46349b3e8141eb9cf6d2dbb228 [diff] |
[sanitizer] Use git for x86_64-linux-*san bots git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@370164 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh index 017013a..0532182 100755 --- a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh +++ b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh
@@ -11,7 +11,7 @@ PLATFORM=`uname` export PATH="/usr/local/bin:$PATH" -USE_GIT=0 +USE_GIT=1 CHECK_LIBCXX=${CHECK_LIBCXX:-1} CHECK_LLD=${CHECK_LLD:-1}
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh index 9c8104b..e74c7e2 100755 --- a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh +++ b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
@@ -11,7 +11,7 @@ PLATFORM=`uname` export PATH="/usr/local/bin:$PATH" -USE_GIT=0 +USE_GIT=1 CHECK_LIBCXX=${CHECK_LIBCXX:-1} CHECK_LLD=${CHECK_LLD:-1}
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh index 6d33a7d..f70bd4e 100755 --- a/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh +++ b/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
@@ -11,7 +11,7 @@ PLATFORM=`uname` export PATH="/usr/local/bin:$PATH" -USE_GIT=0 +USE_GIT=1 CHECK_LIBCXX=${CHECK_LIBCXX:-1} CHECK_LLD=${CHECK_LLD:-1}
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_functions.sh index fe2a739..09132ac 100755 --- a/zorg/buildbot/builders/sanitizers/buildbot_functions.sh +++ b/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
@@ -382,6 +382,9 @@ local clang_path=$ROOT/${STAGE2_DIR}/bin local cmake_stage3_options="${CMAKE_COMMON_OPTIONS} -DCMAKE_C_COMPILER=${clang_path}/clang -DCMAKE_CXX_COMPILER=${clang_path}/clang++" + if [[ "$USE_GIT" != "0" ]]; then + cmake_stage3_options="${cmake_stage3_options} -DLLVM_ENABLE_PROJECTS='clang'" + fi echo @@@BUILD_STEP build stage3/$sanitizer_name clang@@@ (mkdir -p ${build_dir} && cd ${build_dir} && cmake ${cmake_stage3_options} $LLVM && ninja clang) || \