From ac391c82d1f0c8d380e31386472c5aec563d9e56 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Mon, 21 Aug 2017 18:49:34 -0400
Subject: T361: check the build environment setup in ./configure before it can
 even get to make.

---
 Makefile             | 9 +++++----
 scripts/build-config | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d3c1beec..8aa082ce 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,15 @@ all:
 	@echo "Make what specifically?"
 	@echo "The most common target is 'iso'"
 
+.PHONY: check_build_config
+check_build_config:
+	@scripts/check-config
+
 .PHONY: prepare
 prepare:
 	@set -e
 	@echo "Starting VyOS ISO image build"
 
-	@scripts/check-build-env
-	@scripts/check-config
-
 	rm -rf build/config/*
 	@scripts/live-build-config
 	cp -r data/live-build-config/* build/config/
@@ -24,7 +25,7 @@ prepare:
 
 .PHONY: iso
 .ONESHELL:
-iso: clean prepare
+iso: check_build_config clean prepare
 	@set -e
 	@echo "It's not like I'm building this specially for you or anything!"
 	cd $(build_dir)
diff --git a/scripts/build-config b/scripts/build-config
index 9ea92e1f..ae8501e8 100755
--- a/scripts/build-config
+++ b/scripts/build-config
@@ -97,6 +97,11 @@ args['distribution'] = defaults.DEBIAN_DISTRIBUTION
 args['build_dir'] = os.path.join(os.getcwd(), defaults.BUILD_DIR)
 args['pbuilder_config'] = defaults.PBUILDER_CONFIG
 
+# Check the build environment and dependencies
+env_check_retval = os.system("scripts/check-build-env")
+if env_check_retval > 0:
+    print("Build environment check failed, fix the issues and retry")
+
 
 # Save to file
 distutils.dir_util.mkpath(defaults.BUILD_DIR)
-- 
cgit v1.2.3