Do not hardcode GCC/g++ in shell scripts

BSD systems won't alias gcc to clang.

Author: tautschnig

.github/workflows/pull-request-checks.yaml

@@ -59,7 +59,7 @@ jobs:
       - name: Print ccache stats
         run: ccache -s
       - name: Checking completeness of help output
-        run: scripts/check_help.sh
+        run: scripts/check_help.sh g++
       - name: Run unit tests
         run: |
           make -C unit test IPASIR=$PWD/riss.git/riss
@@ -247,7 +247,7 @@ jobs:
       - name: Print ccache stats
         run: ccache -s
       - name: Checking completeness of help output
-        run: scripts/check_help.sh build/bin
+        run: scripts/check_help.sh /usr/bin/g++ build/bin
       - name: Check if package building works
         run: |
           cd build

scripts/bash-autocomplete/extract_switches.sh

@@ -2,15 +2,18 @@
 
 set -e
 
+CXX=$1
+shift
+
 # make sure we execute the remainder in the directory containing this script
 cd `dirname $0`
 
 echo "Compiling the helper file to extract the raw list of parameters from cbmc"
-g++ -E -dM -std=c++17 -I../../src ../../src/cbmc/cbmc_parse_options.cpp -o macros.c
+$CXX -E -dM -std=c++17 -I../../src ../../src/cbmc/cbmc_parse_options.cpp -o macros.c
 echo CBMC_OPTIONS >> macros.c
 
 echo "Converting the raw parameter list to the format required by autocomplete scripts"
-rawstring="`gcc -E -P -w macros.c` \"?h(help)\""
+rawstring="`$CXX -E -P -w macros.c` \"?h(help)\""
 rm macros.c
 
 #now the main bit, convert from raw format to a proper list of switches

scripts/check_help.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+CXX=$1
+shift
+
 # if a command-line argument is provided, use it as a path to built binaries
 # (CMake-style build); otherwise assume we use Makefile-based in-tree build
 if [ $# -eq 1 ] ; then
@@ -33,10 +36,10 @@ for t in  \
   tool_name=$(basename $t)
   opt_name=$(echo $tool_name | tr 'a-z-' 'A-Z_')
 	echo "Extracting the raw list of parameters from $tool_name"
-  g++ -E -dM -std=c++17 -I../src -I../jbmc/src $t/*_parse_options.cpp -o macros.c
+  $CXX -E -dM -std=c++17 -I../src -I../jbmc/src $t/*_parse_options.cpp -o macros.c
   # goto-analyzer partly uses the spelling "analyser" within the code base
   echo ${opt_name}_OPTIONS | sed 's/GOTO_ANALYZER/GOTO_ANALYSER/' >> macros.c
-  rawstring="`gcc -E -P -w macros.c` \"?h(help)\""
+  rawstring="`$CXX -E -P -w macros.c` \"?h(help)\""
   rm macros.c
 
   # now the main bit, convert from raw format to a proper list of switches
@@ -58,8 +61,8 @@ for t in  \
   fi
 
   if [ ! -x $tool_bin ] ; then
-    echo "$tool_bin is not an executable"
-    exit 1
+    echo "$tool_bin is not an executable, cannot check help completeness"
+    continue
   fi
   $tool_bin --help > help_string
   grep '^\\fB\\-' ../doc/man/$tool_name.1 > man_page_opts

src/cbmc/CMakeLists.txt

@@ -59,7 +59,7 @@ endif()
 # bash completion
 if(NOT WIN32)
   add_custom_command(OUTPUT "${CBMC_ROOT_DIR}/scripts/bash-autocomplete/cbmc.sh"
-    COMMAND "${CBMC_ROOT_DIR}/scripts/bash-autocomplete/extract_switches.sh"
+    COMMAND "${CBMC_ROOT_DIR}/scripts/bash-autocomplete/extract_switches.sh" "${CMAKE_CXX_COMPILER}"
     DEPENDS $<TARGET_FILE:cbmc>
   )
   add_custom_target(cbmc.sh ALL