about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--timezone/Makefile9
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index db2764242e..58069c75a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-07  Steve Ellcey  <sellcey@imgtec.com>
+
+	* timezone/Makefile (CFLAGS-zic.c): Add -Wno-unused-variable.
+	(CFLAGS-ialloc.c): Ditto.
+	(CFLAGS-scheck.c): Ditto.
+
 2015-10-07  Carlos O'Donell  <carlos@redhat.com>
 
 	[BZ #19086]
diff --git a/timezone/Makefile b/timezone/Makefile
index a0b8adb5a6..99566cbf12 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -63,10 +63,13 @@ tz-cflags = -DTZDIR='"$(zonedir)"' \
 	    -DTZDEFRULES='"$(posixrules-file)"' \
 	    -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
 
+# The -Wno-unused-variable flag is used to prevent GCC 6
+# from warning about time_t_min and time_t_max which are
+# defined in private.h but not used.
 CFLAGS-zdump.c = -fwrapv -DNOID $(tz-cflags) -DHAVE_GETTEXT
-CFLAGS-zic.c = -DNOID $(tz-cflags) -DHAVE_GETTEXT
-CFLAGS-ialloc.c = -DNOID -DHAVE_GETTEXT
-CFLAGS-scheck.c = -DNOID -DHAVE_GETTEXT
+CFLAGS-zic.c = -DNOID $(tz-cflags) -DHAVE_GETTEXT -Wno-unused-variable
+CFLAGS-ialloc.c = -DNOID -DHAVE_GETTEXT -Wno-unused-variable
+CFLAGS-scheck.c = -DNOID -DHAVE_GETTEXT -Wno-unused-variable
 
 # We have to make sure the data for testing the tz functions is available.
 # Don't add leapseconds here since test-tz made checks that work only without