build Cppcheck with matchcompiler for improved performance

neutrinolabs · Sep 10, 2023 · dce3312 · dce3312
1 parent 364a55c
commit dce3312
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -180,7 +180,7 @@ jobs:
           cache-name: cache-cppcheck
         with:
           path: ~/cppcheck.local
-          key: ${{ steps.os.outputs.image }}-build-${{ env.cache-name }}-${{ env.CPPCHECK_VER }}
+          key: ${{ steps.os.outputs.image }}-build-${{ env.cache-name }}-${{ env.CPPCHECK_VER }}-mc
       - run: sudo scripts/install_cppcheck_dependencies_with_apt.sh $CPPCHECK_VER
       - run: ./bootstrap
       - run: ./configure

diff --git a/scripts/install_cppcheck.sh b/scripts/install_cppcheck.sh
@@ -123,18 +123,20 @@ fi
 
     cd "$workdir"
 
+    make_args="MATCHCOMPILER=yes FILESDIR=$FILESDIR PREFIX=$FILESDIR"
+
     case "$CPPCHECK_VER" in
         1.*)
             # CFGDIR is needed for cppcheck before 1.86
-            make_args="FILESDIR=$FILESDIR PREFIX=$FILESDIR CFGDIR=$FILESDIR"
+            make_args="$make_args CFGDIR=$FILESDIR"
             ;;
         2.8 | 2.9 | 2.1*)
             # Cppcheck 2.8 removed the dependency on z3
             # Cppcheck 2.8 added optional support for utilizing Boost
-            make_args="FILESDIR=$FILESDIR PREFIX=$FILESDIR CPPFLAGS=-DHAVE_BOOST"
+            make_args="$make_args CPPFLAGS=-DHAVE_BOOST"
             ;;
         2.*)
-            make_args="FILESDIR=$FILESDIR PREFIX=$FILESDIR USE_Z3=yes"
+            make_args="$make_args USE_Z3=yes"
             # Check that the Z3 development files appear to be installed
             # before trying to create z3_version.h. Otherwise we may
             # mislead the user as to what needs to be done.