aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas PLANEL <nplanel@gmail.com>2025-02-04 13:05:11 +0100
committerNicolas PLANEL <nplanel@gmail.com>2025-02-04 14:29:45 +0100
commit41392c5e2fca3a46cc967288ccb1e8c368727ca9 (patch)
treea3ebe3c6c0ef5fb4e5413aa2f4dc18f2fec19488
parent7215b9172517b3535cbdd590cf7fca2762530210 (diff)
build: check cmake3 command silently
Avoid which shell command to output verbose errors like """ which: no cmake3 in (/usr/sbin:/sbin:/bin: ... """ Type: make Change-Id: Ib9a5fee72055b80b5e4e4c73280b19fea736c352 Signed-off-by: Nicolas PLANEL <nplanel@gmail.com>
-rw-r--r--build-data/packages/libmemif.mk2
-rw-r--r--build-data/packages/sample-plugin.mk2
-rw-r--r--build-data/packages/vpp.mk2
-rw-r--r--build/build_common.mk2
-rw-r--r--extras/deprecated/vom/vom.mk2
5 files changed, 5 insertions, 5 deletions
diff --git a/build-data/packages/libmemif.mk b/build-data/packages/libmemif.mk
index a4676af456e..111b6bd0770 100644
--- a/build-data/packages/libmemif.mk
+++ b/build-data/packages/libmemif.mk
@@ -14,7 +14,7 @@
libmemif_source = extras
libmemif_configure_subdir = libmemif
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
CMAKE?=cmake3
else
CMAKE?=cmake
diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk
index 546164c0d16..4f9c5531515 100644
--- a/build-data/packages/sample-plugin.mk
+++ b/build-data/packages/sample-plugin.mk
@@ -18,7 +18,7 @@ sample-plugin_CPPFLAGS = $(call installed_includes_fn, vpp)
sample-plugin_LDFLAGS = $(call installed_libs_fn, vpp)
sample-plugin_PATH = $(call package_install_dir_fn,vpp)/bin
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
CMAKE?=cmake3
else
CMAKE?=cmake
diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index cdd40655dce..62d35f167fa 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -13,7 +13,7 @@
vpp_source = src
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
CMAKE?=cmake3
else
CMAKE?=cmake
diff --git a/build/build_common.mk b/build/build_common.mk
index 88529a4537e..8f8a0a1db43 100644
--- a/build/build_common.mk
+++ b/build/build_common.mk
@@ -41,7 +41,7 @@ L := $(WORKSPACE)/archives/install-deps-logs
$(shell rm -rf $(L) && mkdir -p $(L))
endif
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
CMAKE?=cmake3
else
CMAKE?=cmake
diff --git a/extras/deprecated/vom/vom.mk b/extras/deprecated/vom/vom.mk
index f284473beb5..97fa900b842 100644
--- a/extras/deprecated/vom/vom.mk
+++ b/extras/deprecated/vom/vom.mk
@@ -15,7 +15,7 @@ vom_configure_depend = vpp-install
vom_source = extras
vom_configure_subdir = vom
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
CMAKE?=cmake3
else
CMAKE?=cmake