From 41728b3c6ce85912c466bfb6cffd266226fadda9 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 20 Aug 2014 01:21:45 -0400 Subject: [PATCH] Fixed the cmake-guided static analysis and use it by default. The configure script fails on it on Mac OS X, now, for whatever reason. Hopefully gets our static analysis buildslave running again! --- build-scripts/checker-buildbot.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/checker-buildbot.sh b/build-scripts/checker-buildbot.sh index 4ecce6154..682e7fbbb 100755 --- a/build-scripts/checker-buildbot.sh +++ b/build-scripts/checker-buildbot.sh @@ -61,13 +61,13 @@ mkdir checker-buildbot cd checker-buildbot # You might want to do this for CMake-backed builds instead... -#cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER="$CHECKERDIR/libexec/ccc-analyzer" .. +PATH="$CHECKERDIR:$PATH" scan-build -o analysis cmake -DCMAKE_BUILD_TYPE=Debug .. # ...or run configure without the scan-build wrapper... #CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0" ../configure -# ...but this works for our buildbots just fine. -CFLAGS="-O0" PATH="$CHECKERDIR:$PATH" scan-build -o analysis ../configure +# ...but this works for our buildbots just fine (EXCEPT ON LATEST MAC OS X). +#CFLAGS="-O0" PATH="$CHECKERDIR:$PATH" scan-build -o analysis ../configure rm -rf analysis PATH="$CHECKERDIR:$PATH" scan-build -o analysis $MAKE