summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makeconfig3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 408d7356ad..d834107754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2018-08-21 Florian Weimer <fweimer@redhat.com>
+ [BZ #17248]
+ * Makeconfig (+cflags): Do not sort (and deduplicate).
+
+2018-08-21 Florian Weimer <fweimer@redhat.com>
+
* debug/readlink_chk.c (__readlink_chk): Always call __readlink.
* sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove file.
diff --git a/Makeconfig b/Makeconfig
index 92e76d6200..a9e50e5b60 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -902,9 +902,6 @@ endif # $(+cflags) == ""
$(+stack-protector)
+gcc-nowarn := -w
-# Don't duplicate options if we inherited variables from the parent.
-+cflags := $(sort $(+cflags))
-
# Each sysdeps directory can contain header files that both will be
# used to compile and will be installed. Each can also contain an
# include/ subdirectory, whose header files will be used to compile