Skip to content

Commit 6de6048

Browse files
committed
[NFC][sanitizer] Define BUILD_DIR once
1 parent d1ce618 commit 6de6048

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

zorg/buildbot/builders/sanitizers/buildbot_cmake.sh

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,26 @@ CMAKE_COMMON_OPTIONS+=" ${CMAKE_ARGS}"
5656
buildbot_update
5757

5858
function build {
59-
local build_dir="build_${1}"
59+
BUILD_DIR="build_${1}"
6060
echo "@@@BUILD_STEP build compiler-rt ${1}@@@"
61-
[[ ! -f "${build_dir}/delete_next_time" ]] || rm -rf "${build_dir}"
62-
mkdir -p ${build_dir}
61+
[[ ! -f "${BUILD_DIR}/delete_next_time" ]] || rm -rf "${BUILD_DIR}"
62+
mkdir -p ${BUILD_DIR}
6363

64-
cmake -B ${build_dir} ${CMAKE_COMMON_OPTIONS} ${2} $LLVM || {
65-
touch "${build_dir}/delete_next_time"
64+
cmake -B ${BUILD_DIR} ${CMAKE_COMMON_OPTIONS} ${2} $LLVM || {
65+
touch "${BUILD_DIR}/delete_next_time"
6666
build_failure
6767
}
68-
ninja -C ${build_dir} || {
69-
touch "${build_dir}/delete_next_time"
68+
ninja -C ${BUILD_DIR} || {
69+
touch "${BUILD_DIR}/delete_next_time"
7070
build_failure
7171
}
7272
}
7373

7474
function build_and_test {
7575
build "${1}" "${2}"
7676

77-
local build_dir="build_${1}"
7877
echo "@@@BUILD_STEP test compiler-rt ${1}@@@"
79-
ninja -C ${build_dir} check-compiler-rt || build_failure
78+
ninja -C ${BUILD_DIR} check-compiler-rt || build_failure
8079
}
8180

8281
CMAKE_COMMON_OPTIONS+=" ${STAGE1_AS_COMPILER}"
@@ -95,7 +94,7 @@ build "tsan_debug" "-DCOMPILER_RT_DEBUG=ON -DCOMPILER_RT_TSAN_DEBUG_OUTPUT=ON -D
9594

9695
build_and_test "default" ""
9796

98-
FRESH_CLANG_PATH=${ROOT}/build_default/bin
97+
FRESH_CLANG_PATH=${ROOT}/${BUILD_DIR}/bin
9998

10099
echo @@@BUILD_STEP build standalone compiler-rt@@@
101100
mkdir -p compiler_rt_build

0 commit comments

Comments
 (0)