rpms/binutils
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spec: Consistently use %set_build_flags

Browse Source 
So we can always refer to CFLAGS and LDFLAGS instead of swithing between
them and the RPM_ equivalent.
This commit is contained in:
Timm Bäder 2021-05-08 10:13:53 +02:00
parent 5e669f0402
commit 117b4ee5c2
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
binutils.spec
View File

@ -466,11 +466,10 @@ touch */configure
%build %build
echo target is %{binutils_target} echo target is %{binutils_target}
%set_build_flags
%ifarch %{power64} %ifarch %{power64}
export CFLAGS="$RPM_OPT_FLAGS -Wno-error" export CFLAGS="$CFLAGS -Wno-error"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif %endif
CARGS= CARGS=
@ -524,9 +523,6 @@ export CFLAGS="$CFLAGS -O0 -ggdb2 -Wno-error -D_FORTIFY_SOURCE=0"
%define enable_shared 0 %define enable_shared 0
%endif %endif
# BZ 1541027 - include the linker flags from redhat-rpm-config as well.
export LDFLAGS=$RPM_LD_FLAGS
%if %{with clang} %if %{with clang}
%define _with_cc_clang 1 %define _with_cc_clang 1
%endif %endif
@ -656,19 +652,19 @@ make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info
# Future: Remove it together with its header file, projects should bundle it. # Future: Remove it together with its header file, projects should bundle it.
%make_build -C libiberty clean %make_build -C libiberty clean
%set_build_flags %set_build_flags
%make_build CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C libiberty %make_build CFLAGS="-g -fPIC $CFLAGS" -C libiberty
# Rebuild libbfd.a with -fPIC. # Rebuild libbfd.a with -fPIC.
# Without the hidden visibility the 3rd party shared libraries would export # Without the hidden visibility the 3rd party shared libraries would export
# the bfd non-stable ABI. # the bfd non-stable ABI.
%make_build -C bfd clean %make_build -C bfd clean
%set_build_flags %set_build_flags
%make_build CFLAGS="-g -fPIC $RPM_OPT_FLAGS -fvisibility=hidden" -C bfd %make_build CFLAGS="-g -fPIC $CFLAGS -fvisibility=hidden" -C bfd
# Rebuild libopcodes.a with -fPIC. # Rebuild libopcodes.a with -fPIC.
%make_build -C opcodes clean %make_build -C opcodes clean
%set_build_flags %set_build_flags
%make_build CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C opcodes %make_build CFLAGS="-g -fPIC $CFLAGS" -C opcodes
install -m 644 bfd/libbfd.a %{buildroot}%{_libdir} install -m 644 bfd/libbfd.a %{buildroot}%{_libdir}
install -m 644 libiberty/libiberty.a %{buildroot}%{_libdir} install -m 644 libiberty/libiberty.a %{buildroot}%{_libdir}