build: fix on systems with bmake as make impl

For example, on FreeBSD, bmake is the default make implementation. Thus, to
build CBQN, we must use 'gmake' invocations. This patch fixes the hardcoded call
to 'make' in build/build.
This commit is contained in:
Siva Mahadevan 2024-10-13 21:46:49 -04:00
parent 1e00aa71c9
commit a18f547b44
2 changed files with 2 additions and 2 deletions

View File

@ -3,7 +3,7 @@ DIR="$(dirname $0)"
PREV_BQN="$DIR/obj2/for_build4" PREV_BQN="$DIR/obj2/for_build4"
if [ ! -f "$PREV_BQN" ]; then if [ ! -f "$PREV_BQN" ]; then
TMP_BQN="$DIR/obj2/for_build_tmp" TMP_BQN="$DIR/obj2/for_build_tmp"
if make -C "$DIR/.." for-build OUTPUT="$TMP_BQN"; then if "${MAKE:-make}" -C "$DIR/.." for-build OUTPUT="$TMP_BQN"; then
if [ "4" = "$("$TMP_BQN" -p "2+2")" ]; then if [ "4" = "$("$TMP_BQN" -p "2+2")" ]; then
true true
else else

View File

@ -83,7 +83,7 @@ endif
ifeq ($(origin clean),command line) ifeq ($(origin clean),command line)
@echo "Error: build-specific 'clean' unsupported"; false @echo "Error: build-specific 'clean' unsupported"; false
endif endif
@build/build from-makefile CC="$(CC)" CXX="$(CXX)" PIE="$(ENABLE_PIE)" OUTPUT="$(OUTPUT)" j="$(j)" \ @MAKE="$(MAKE)" build/build from-makefile CC="$(CC)" CXX="$(CXX)" PIE="$(ENABLE_PIE)" OUTPUT="$(OUTPUT)" j="$(j)" \
verbose="$(verbose)" notui="$(notui)" v="$(version)" stored-warn="$(stored-warn)" \ verbose="$(verbose)" notui="$(notui)" v="$(version)" stored-warn="$(stored-warn)" \
f="$(f)" lf="$(lf)" CCFLAGS="$(CCFLAGS)" LDFLAGS="$(LDFLAGS)" REPLXX_FLAGS="$(REPLXX_FLAGS)" CXXFLAGS="$(CXXFLAGS)" \ f="$(f)" lf="$(lf)" CCFLAGS="$(CCFLAGS)" LDFLAGS="$(LDFLAGS)" REPLXX_FLAGS="$(REPLXX_FLAGS)" CXXFLAGS="$(CXXFLAGS)" \
LD_LIBS="$(LD_LIBS)" NO_LDL="$(NO_LDL)" no_fPIC="$(no_fPIC)" target-from-cc="$(target_from_cc)" \ LD_LIBS="$(LD_LIBS)" NO_LDL="$(NO_LDL)" no_fPIC="$(no_fPIC)" target-from-cc="$(target_from_cc)" \