File tree Expand file tree Collapse file tree 2 files changed +12
-8
lines changed Expand file tree Collapse file tree 2 files changed +12
-8
lines changed Original file line number Diff line number Diff line change 66: " ${CMAKE:= no} "
77: " ${REMOTE:= no} "
88: " ${LIBPCAP_TAINTED:= no} "
9+ : " ${MAKE_BIN:= make} "
910
1011. ./build_common.sh
1112# Install directory prefix
9495 run_after_echo cmake ${CFLAGS: +-DEXTRA_CFLAGS=" $CFLAGS " } \
9596 -DCMAKE_INSTALL_PREFIX=" $PREFIX " -DENABLE_REMOTE=" $REMOTE " ..
9697fi
97- run_after_echo make -s clean
98+ run_after_echo " $MAKE_BIN " -s clean
9899if [ " $CMAKE " = no ]; then
99- run_after_echo make -s ${CFLAGS: +CFLAGS=" $CFLAGS " }
100- run_after_echo make -s testprogs ${CFLAGS: +CFLAGS=" $CFLAGS " }
100+ run_after_echo " $MAKE_BIN " -s ${CFLAGS: +CFLAGS=" $CFLAGS " }
101+ run_after_echo " $MAKE_BIN " -s testprogs ${CFLAGS: +CFLAGS=" $CFLAGS " }
101102else
102103 # The "-s" flag is a no-op and CFLAGS is set using -DEXTRA_CFLAGS above.
103- run_after_echo make
104- run_after_echo make testprogs
104+ run_after_echo " $MAKE_BIN "
105+ run_after_echo " $MAKE_BIN " testprogs
105106fi
106- run_after_echo make install
107+ run_after_echo " $MAKE_BIN " install
107108if [ " $CMAKE " = no ]; then
108109 run_after_echo testprogs/findalldevstest
109- run_after_echo make releasetar
110+ run_after_echo " $MAKE_BIN " releasetar
110111else
111112 run_after_echo run/findalldevstest
112113fi
Original file line number Diff line number Diff line change 1212# not warning-free because of the OS, the compiler or whatever other factor
1313# that the scripts can detect both in and out of CI.
1414: " ${LIBPCAP_TAINTED:= no} "
15+ # Some OSes have native make without parallel jobs support and sometimes have
16+ # GNU Make available as "gmake".
17+ : " ${MAKE_BIN:= make} "
1518# It calls the build.sh script which runs one build with setup environment
1619# variables: CC, CMAKE and REMOTE.
1720
@@ -45,7 +48,7 @@ for CC in $MATRIX_CC; do
4548 # Run one build with setup environment variables: CC, CMAKE and REMOTE
4649 run_after_echo ./build.sh
4750 echo ' Cleaning...'
48- if [ " $CMAKE " = yes ]; then rm -rf build; else make distclean; fi
51+ if [ " $CMAKE " = yes ]; then rm -rf build; else " $MAKE_BIN " distclean; fi
4952 purge_directory " $PREFIX "
5053 run_after_echo git status -suall
5154 # Cancel changes in configure
You can’t perform that action at this time.
0 commit comments