bgp: Parse BGP extended message support capability

[tcpdump] / build_matrix.sh

diff --git a/build_matrix.sh b/build_matrix.sh
index b16e03e5e00d55ba3a38a5f5c13d79bfde1d7a01..829271ab6b36d6f40a18b2a1beaf996ca1b98074 100755 (executable)
--- a/build_matrix.sh
+++ b/build_matrix.sh
@@ -19,6 +19,9 @@
 # not warning-free because of the OS, the compiler or whatever other factor
 # that the scripts can detect both in and out of CI.
 : "${TCPDUMP_TAINTED:=no}"
 # not warning-free because of the OS, the compiler or whatever other factor
 # that the scripts can detect both in and out of CI.
 : "${TCPDUMP_TAINTED:=no}"

+# Some OSes have native make without parallel jobs support and sometimes have
+# GNU Make available as "gmake".
+: "${MAKE_BIN:=make}"

 
 . ./build_common.sh
 print_sysinfo
 
 . ./build_common.sh
 print_sysinfo


@@ -31,6 +34,7 @@ if [ -z "$PREFIX" ]; then
 fi
 COUNT=0
 export TCPDUMP_TAINTED
 fi
 COUNT=0
 export TCPDUMP_TAINTED

+export MAKE_BIN

 
 build_tcpdump() {
     for CMAKE in $MATRIX_CMAKE; do
 
 build_tcpdump() {
     for CMAKE in $MATRIX_CMAKE; do


@@ -49,7 +53,7 @@ build_tcpdump() {
                 if [ "$CMAKE" = yes ]; then
                     run_after_echo rm -rf build
                 else
                 if [ "$CMAKE" = yes ]; then
                     run_after_echo rm -rf build
                 else

-                    run_after_echo make distclean
+                    run_after_echo "$MAKE_BIN" distclean

                 fi
                 run_after_echo rm -rf "$PREFIX"/bin/tcpdump*
                 run_after_echo git status -suall
                 fi
                 run_after_echo rm -rf "$PREFIX"/bin/tcpdump*
                 run_after_echo git status -suall


@@ -87,7 +91,7 @@ for CC in $MATRIX_CC; do
             echo_magenta 'Use system libpcap' >&2
             purge_directory "$PREFIX"
             if [ -d ../libpcap ]; then
             echo_magenta 'Use system libpcap' >&2
             purge_directory "$PREFIX"
             if [ -d ../libpcap ]; then

-                (cd ../libpcap; make distclean || echo '(Ignoring the make error.)')
+                (cd ../libpcap; "$MAKE_BIN" distclean || echo '(Ignoring the make error.)')

             fi
             build_tcpdump
         fi
             fi
             build_tcpdump
         fi