about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-09-18 22:02:32 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-09-18 22:02:32 +0000
commit36546ffbef5d4f5ea0f5d5c8e3fe5a5c9a34ea47 (patch)
tree92d3eea99dd54b27022ee176e8bdc338b7492280
parent6f0f237bf5a3c8d29a6342cbf8b4c17b10aa1d4c (diff)
downloadglibc-36546ffbef5d4f5ea0f5d5c8e3fe5a5c9a34ea47.tar.gz
glibc-36546ffbef5d4f5ea0f5d5c8e3fe5a5c9a34ea47.tar.xz
glibc-36546ffbef5d4f5ea0f5d5c8e3fe5a5c9a34ea47.zip
Revert timezone/Makefile change.
This change breaks the build with all released versions of GCC.

	* timezone/Makefile: Revert previous change.
-rw-r--r--ChangeLog2
-rw-r--r--timezone/Makefile10
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4be1427a04..789a714df2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-09-18  Joseph Myers  <joseph@codesourcery.com>
 
+	* timezone/Makefile: Revert previous change.
+
 	[BZ #18980]
 	* sysdeps/i386/fpu/i386-math-asm.h (DEFINE_FLT_MIN): New macro.
 	(DEFINE_DBL_MIN): Likewise.
diff --git a/timezone/Makefile b/timezone/Makefile
index afd9e880b7..bfb3463373 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -61,12 +61,10 @@ tz-cflags = -DTZDIR='"$(zonedir)"' \
 	    -DTZDEFRULES='"$(posixrules-file)"' \
 	    -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
 
-CFLAGS-zdump.c = -fwrapv -DNOID $(tz-cflags) -DHAVE_GETTEXT \
-		 -Wno-error=unused-const-variable
-CFLAGS-zic.c = -DNOID $(tz-cflags) -DHAVE_GETTEXT \
-	       -Wno-error=unused-const-variable
-CFLAGS-ialloc.c = -DNOID -DHAVE_GETTEXT -Wno-error=unused-const-variable
-CFLAGS-scheck.c = -DNOID -DHAVE_GETTEXT -Wno-error=unused-const-variable
+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
 
 # 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