aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-08-21 11:43:35 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-08-21 11:43:35 +0200
commitc7627f41baaeb7f1a7b73ff66ef48eaafc1990f6 (patch)
treedaaeb30a4905b951fa44b70cdaf61e7d6986b93b
parentef939d928a5b9f2d9b103b16cb7acc1d2fbcbb80 (diff)
downloadglibc-c7627f41baaeb7f1a7b73ff66ef48eaafc1990f6.zip
glibc-c7627f41baaeb7f1a7b73ff66ef48eaafc1990f6.tar.gz
glibc-c7627f41baaeb7f1a7b73ff66ef48eaafc1990f6.tar.bz2
Makeconfig: Do not sort and deduplicate +cflags [BZ # 17248]
The original intent behind this is unclear. It interferes with flags that has to be ordered in a particular way.
-rw-r--r--ChangeLog5
-rw-r--r--Makeconfig3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 408d735..d834107 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 92e76d6..a9e50e5 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