Inherit compiler flags in the original order
This commit is contained in:
parent
512e08766b
commit
fb93b16951
17
glibc.spec
17
glibc.spec
@ -1,6 +1,6 @@
|
|||||||
%define glibcsrcdir glibc-2.27-37-g39071a5539
|
%define glibcsrcdir glibc-2.27-37-g39071a5539
|
||||||
%define glibcversion 2.27
|
%define glibcversion 2.27
|
||||||
%define glibcrelease 10%{?dist}
|
%define glibcrelease 11%{?dist}
|
||||||
# Pre-release tarballs are pulled in from git using a command that is
|
# Pre-release tarballs are pulled in from git using a command that is
|
||||||
# effectively:
|
# effectively:
|
||||||
#
|
#
|
||||||
@ -823,20 +823,14 @@ df
|
|||||||
GCC=gcc
|
GCC=gcc
|
||||||
GXX=g++
|
GXX=g++
|
||||||
|
|
||||||
# True if the compiler flag in the first argument is listed in
|
|
||||||
# redhat-rpm-config.
|
|
||||||
rpm_has_compiler_flag ()
|
|
||||||
{
|
|
||||||
echo " $RPM_OPT_FLAGS $RPM_LD_FLAGS " | grep -q -F " $1 "
|
|
||||||
}
|
|
||||||
|
|
||||||
# Propagates the listed flags to BuildFlags if supplied by redhat-rpm-config.
|
# Propagates the listed flags to BuildFlags if supplied by redhat-rpm-config.
|
||||||
BuildFlags="-O2 -g"
|
BuildFlags="-O2 -g"
|
||||||
rpm_inherit_flags ()
|
rpm_inherit_flags ()
|
||||||
{
|
{
|
||||||
|
local reference=" $* "
|
||||||
local flag
|
local flag
|
||||||
for flag in "$@" ; do
|
for flag in $RPM_OPT_FLAGS $RPM_LD_FLAGS ; do
|
||||||
if rpm_has_compiler_flag "$flag" ; then
|
if echo "$reference" | grep -q -F " $flag " ; then
|
||||||
BuildFlags="$BuildFlags $flag"
|
BuildFlags="$BuildFlags $flag"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@ -1969,6 +1963,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 11 2018 Florian Weimer <fweimer@redhat.com> - 2.27-11
|
||||||
|
- Inherit compiler flags in the original order
|
||||||
|
|
||||||
* Fri May 11 2018 Florian Weimer <fweimer@redhat.com> - 2.27-10
|
* Fri May 11 2018 Florian Weimer <fweimer@redhat.com> - 2.27-10
|
||||||
- Inherit the -mstackrealign flag if it is set
|
- Inherit the -mstackrealign flag if it is set
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user