Removes redundant condition in Makefile.

jonathonl · jonathonl · commit 198a43ef9278 · 2018-02-22T14:11:59.000-05:00
diff --git a/general/Makefile b/general/Makefile
@@ -10,7 +10,7 @@ ifeq ($(UNAME), Linux)
   #
   # Disable format-truncation check because StringBasics specifically tests
   # to make sure snprintf truncates as expected.
-  USER_WARNINGS ?= -Werror -Wno-format-truncation $(shell if [ X$(CCVERSION) \> X7.0.0 ] ; then echo " -Wno-strict-overflow -Wno-format-truncation" ; elif [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi)
+  USER_WARNINGS ?= -Werror -Wno-format-truncation $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi)
 #  USER_WARNINGS ?= -Werror $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi)
 #-Wno-strict-overflow
 # -Wno-unused-variable $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-unused-result" ; fi)

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ ifeq ($(UNAME), Linux)`
`10`	`10`	`#`
`11`	`11`	`# Disable format-truncation check because StringBasics specifically tests`
`12`	`12`	`# to make sure snprintf truncates as expected.`
`13`		`- USER_WARNINGS ?= -Werror -Wno-format-truncation $(shell if [ X$(CCVERSION) \> X7.0.0 ] ; then echo " -Wno-strict-overflow -Wno-format-truncation" ; elif [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi)`
	`13`	`+ USER_WARNINGS ?= -Werror -Wno-format-truncation $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi)`
`14`	`14`	`# USER_WARNINGS ?= -Werror $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-strict-overflow" ; fi)`
`15`	`15`	`#-Wno-strict-overflow`
`16`	`16`	`# -Wno-unused-variable $(shell if [ X$(CCVERSION) \> X4.2.0 ] ; then echo " -Wno-unused-result" ; fi)`