From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 21 Aug 2018 09:43:35 +0000 (+0200)
Subject: Makeconfig: Do not sort and deduplicate +cflags [BZ # 17248]
X-Git-Tag: glibc-2.29~512
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7627f41baaeb7f1a7b73ff66ef48eaafc1990f6;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 408d7356ade..d8341077546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/Makeconfig b/Makeconfig
index 92e76d6200b..a9e50e5b60a 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