@@ -56,27 +56,26 @@ CMAKE_COMMON_OPTIONS+=" ${CMAKE_ARGS}"
56
56
buildbot_update
57
57
58
58
function build {
59
- local build_dir =" build_${1} "
59
+ BUILD_DIR =" build_${1} "
60
60
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 }
63
63
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"
66
66
build_failure
67
67
}
68
- ninja -C ${build_dir } || {
69
- touch " ${build_dir } /delete_next_time"
68
+ ninja -C ${BUILD_DIR } || {
69
+ touch " ${BUILD_DIR } /delete_next_time"
70
70
build_failure
71
71
}
72
72
}
73
73
74
74
function build_and_test {
75
75
build " ${1} " " ${2} "
76
76
77
- local build_dir=" build_${1} "
78
77
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
80
79
}
81
80
82
81
CMAKE_COMMON_OPTIONS+=" ${STAGE1_AS_COMPILER} "
@@ -95,7 +94,7 @@ build "tsan_debug" "-DCOMPILER_RT_DEBUG=ON -DCOMPILER_RT_TSAN_DEBUG_OUTPUT=ON -D
95
94
96
95
build_and_test " default" " "
97
96
98
- FRESH_CLANG_PATH=${ROOT} /build_default /bin
97
+ FRESH_CLANG_PATH=${ROOT} /${BUILD_DIR} /bin
99
98
100
99
echo @@@BUILD_STEP build standalone compiler-rt@@@
101
100
mkdir -p compiler_rt_build
0 commit comments