From a19e674be003aebc59d897aa111117235ab0d353 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Mon, 26 Aug 2019 15:28:24 -0700 Subject: [PATCH] make: always fail if mk/config.mk doesn't exist. We previously were failing for all make targets except for clean if the mk/config.mk file didn't exist, but we should also be failing to perform make clean if we don't have this file. It turns out you end up erroring out in the next line anyways. Also, if you make that include optional, make still fails because we don't have any kind of environment specified and spdk.common.mk depends on that variable being defined. There may be some benefit to being able to run make clean if we don't have a valid configuration file, but right now, there are a lot of things that depend on the configuration file, such as which environment file to make or clean and which directories need cleaned. Change-Id: I2a9c1e982c01ba76b67b153ee7336402300b76b0 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466346 Tested-by: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- mk/spdk.common.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk index fb67677ac..317356edc 100644 --- a/mk/spdk.common.mk +++ b/mk/spdk.common.mk @@ -33,10 +33,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -ifneq ($(MAKECMDGOALS),clean) ifeq ($(wildcard $(SPDK_ROOT_DIR)/mk/config.mk),) -$(error mk/config.mk: file not found. Please run configure before 'make $(filter-out clean,$(MAKECMDGOALS))') -endif +$(error mk/config.mk: file not found. Please run configure before make) endif include $(SPDK_ROOT_DIR)/mk/config.mk