build: Use $(MAKE) instead of direct call to make
No functional changes, just make it to respect original make binary name used to start building Type: improvement Change-Id: Ic8568237fbb39c6a0d3b7405a9670e9410aeb752 Signed-off-by: Renato Botelho do Couto <renato@netgate.com>
This commit is contained in:

committed by
Damjan Marion

parent
fa500e9854
commit
893dacae3f
@ -87,15 +87,15 @@ list-tests:
|
||||
|
||||
.PHONY: build-vpp-release
|
||||
build-vpp-release:
|
||||
@make -C ../.. build-release
|
||||
@$(MAKE) -C ../.. build-release
|
||||
|
||||
.PHONY: build-vpp-debug
|
||||
build-vpp-debug:
|
||||
@make -C ../.. build
|
||||
@$(MAKE) -C ../.. build
|
||||
|
||||
.PHONY: build-vpp-gcov
|
||||
build-vpp-gcov:
|
||||
@make -C ../.. build-vpp-gcov
|
||||
@$(MAKE) -C ../.. build-vpp-gcov
|
||||
|
||||
.build.ok: build
|
||||
@touch .build.ok
|
||||
@ -129,7 +129,7 @@ test-cov: .deps.ok .build.cov.ok
|
||||
-bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
|
||||
--unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \
|
||||
--vppsrc=$(VPPSRC)
|
||||
@make -C ../.. test-cov-post HS_TEST=1
|
||||
@$(MAKE) -C ../.. test-cov-post HS_TEST=1
|
||||
@bash ./script/compress.sh
|
||||
|
||||
.PHONY: build-go
|
||||
@ -155,7 +155,7 @@ build-debug: .deps.ok build-vpp-debug build-go
|
||||
@touch .build.ok
|
||||
|
||||
.deps.ok:
|
||||
@sudo make install-deps
|
||||
@sudo $(MAKE) install-deps
|
||||
|
||||
.PHONY: install-deps
|
||||
install-deps:
|
||||
|
@ -76,8 +76,8 @@ install-swan:
|
||||
echo "SSWAN not downloaded, please run "make" or "make pull-swan" first." ; \
|
||||
exit 1 ; \
|
||||
fi
|
||||
cd ${SWANDIR} && make -j$(nproc)
|
||||
cd ${SWANDIR} && sudo make install
|
||||
cd ${SWANDIR} && $(MAKE) -j$(nproc)
|
||||
cd ${SWANDIR} && sudo $(MAKE) install
|
||||
|
||||
# check if VPP is installed
|
||||
ifneq ($(shell test "$(shell ldconfig -p | grep vppinfra.so | awk 'NR==1{print $$1;}')" && echo "yes"), yes)
|
||||
|
Reference in New Issue
Block a user