This is an archive of the discontinued LLVM Phabricator instance.

Differential D100038

[Sanitizer] Fix ccache not found and unbound variable errors
AbandonedPublic

Authored by Conanap on Apr 7 2021, 7:53 AM.

Details

Reviewers
gkistanova
saghir
stefanp
lei
Summary

I noticed a ccache: command not found error and this fixes that by checking the utility is available before running it.

Diff Detail

Event Timeline

Conanap created this revision.Apr 7 2021, 7:53 AM
Herald added a subscriber: mgorny. · View Herald TranscriptApr 7 2021, 7:53 AM
Conanap requested review of this revision.Apr 7 2021, 7:53 AM
Conanap updated this revision to Diff 335813.Apr 7 2021, 8:05 AM

removed incorrect brackets

Harbormaster completed remote builds in B97512: Diff 335813.Apr 7 2021, 8:05 AM
Conanap added a comment.Apr 7 2021, 1:44 PM

Sorry to ping you @gkistanova; this one is a bit urgent though. Thanks!

lei accepted this revision.Apr 8 2021, 6:54 AM
lei added a subscriber: lei.

LGTM

This revision is now accepted and ready to land.Apr 8 2021, 6:54 AM
Conanap closed this revision.Apr 8 2021, 7:18 AM

pushed

Conanap updated this revision to Diff 336106.Apr 8 2021, 7:43 AM
Conanap edited the summary of this revision. (Show Details)

Another person had made the same fix for the CMAKE_ARGS variable declaration, so this just adds a conditional to ccache. No longer an urgent issue.

Conanap reopened this revision.Apr 8 2021, 7:43 AM
This revision is now accepted and ready to land.Apr 8 2021, 7:43 AM
Harbormaster completed remote builds in B97731: Diff 336106.Apr 8 2021, 7:53 AM
Conanap abandoned this revision.Apr 13 2021, 8:17 AM

This doesn't actually seem to affect buildbot's operations so the changes is not likely needed.

Revision Contents

PathSize
zorg/
buildbot/
builders/
sanitizers/
2 lines

Diff 336106

zorg/buildbot/builders/sanitizers/buildbot_cmake.sh

Show All 20 Lines case $arg in
CMAKE_ARGS="${arg#*=}" CMAKE_ARGS="${arg#*=}"
esac esac
done done
# Always clobber bootstrap build trees. # Always clobber bootstrap build trees.
rm -rf compiler_rt_build llvm_build* symbolizer_build* rm -rf compiler_rt_build llvm_build* symbolizer_build*
USE_CCACHE= USE_CCACHE=
if ccache -s ; then if command -v ccache && ccache -s ; then
USE_CCACHE="-DLLVM_CCACHE_BUILD=ON" USE_CCACHE="-DLLVM_CCACHE_BUILD=ON"
rm -rf clang_build rm -rf clang_build
fi fi
SUPPORTS_32_BITS=${SUPPORTS_32_BITS:-1} SUPPORTS_32_BITS=${SUPPORTS_32_BITS:-1}
MAKE_JOBS=${MAX_MAKE_JOBS:-$(nproc)} MAKE_JOBS=${MAX_MAKE_JOBS:-$(nproc)}
LLVM=$ROOT/llvm LLVM=$ROOT/llvm
ZLIB=$ROOT/zlib ZLIB=$ROOT/zlib
▲ Show 20 Lines • Show All 310 Lines • Show Last 20 Lines