From 055d5679a43ea50b7fef3dc9cc844d845e0f4a31 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 19 Mar 2014 15:25:27 -0400 Subject: [PATCH] Make checker-buildbot.sh work just about anywhere Clang is installed. --- build-scripts/checker-buildbot.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build-scripts/checker-buildbot.sh b/build-scripts/checker-buildbot.sh index 9e392c0f24dc1..dd74280459af7 100755 --- a/build-scripts/checker-buildbot.sh +++ b/build-scripts/checker-buildbot.sh @@ -10,12 +10,16 @@ # this currently expects a mercurial working copy that it can modify a little. -CHECKERDIR="/usr/local/checker-276" - FINALDIR="$1" +CHECKERDIR="/usr/local/checker-276" +if [ ! -d "$CHECKERDIR" ]; then + echo "$CHECKERDIR not found. Trying /usr/share/clang ..." 1>&2 + CHECKERDIR="/usr/share/clang/scan-build" +fi + if [ ! -d "$CHECKERDIR" ]; then - echo "$CHECKERDIR not found." 1>&2 + echo "$CHECKERDIR not found. Giving up." 1>&2 exit 1 fi @@ -61,7 +65,9 @@ fi mkdir checker-buildbot cd checker-buildbot #cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER="$CHECKERDIR/libexec/ccc-analyzer" -DSDL_STATIC=OFF .. -CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0" ../configure +#CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0" ../configure +CFLAGS="-O0" PATH="$CHECKERDIR:$PATH" scan-build -o analysis ../configure +rm -rf analysis PATH="$CHECKERDIR:$PATH" scan-build -o analysis $MAKE mv analysis/* ../analysis rmdir analysis # Make sure this is empty.