[Skiboot] [PATCH v2] stable/build: Do not convert warnings to error

Vasant Hegde hegdevasant at linux.vnet.ibm.com
Thu Dec 12 16:33:11 AEDT 2019


During skiboot build, by default we convert all warnings to error.
Because of this sometime skiboot stable branch fails to build on
modern compiler. And we endup backporting build failure fixes to
stable branches.

Hence lets disable `-Werror` on skiboot stable branches (tagged version).

Suggested-by: Oliver O'Halloran <oohall at gmail.com>
Signed-off-by: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
---
 Makefile.main | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile.main b/Makefile.main
index 4d7ebcec9..5803d883b 100644
--- a/Makefile.main
+++ b/Makefile.main
@@ -31,8 +31,17 @@ CWARNS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 	  -Wno-pointer-sign -Wextra -Wno-sign-compare \
 	  -Wmissing-prototypes -Wmissing-declarations \
 	  -Wwrite-strings -Wcast-align \
-	  -Winit-self \
-	  -Werror
+	  -Winit-self
+
+# Do not convert warnings to error on tagged/released version
+GIT_DIR ?= $(shell test -e $(SRC)/.git && echo 1 || echo 0)
+ifeq ($(GIT_DIR),1)	# Building from git tree
+GIT_SHA ?= $(shell cd $(SRC); git describe --tags 2>/dev/null)
+GIT_TAG ?= $(shell cd $(SRC); git tag -l 2>/dev/null | grep -x ${GIT_SHA} >/dev/null 2>&1 && echo 1 || echo 0)
+ifneq ($(GIT_TAG),1)	# Development branch
+CWARNS += -Werror
+endif
+endif
 
 # Host tools and options
 HOSTCC=gcc
-- 
2.21.0



More information about the Skiboot mailing list